Commit Graph

125 Commits

Author SHA1 Message Date
Kuldeep Aggarwal
fff0309081 unnecessary checking of size with second regex if matched with first one 2013-11-27 15:51:47 +05:30
Akira Matsuda
499b602c8e Minor typo fixes 2013-11-27 02:27:38 +09:00
Carlos Antonio da Silva
b2c7d2345f Revert "Merge pull request #13027 from akshay-vishnoi/f-refactor"
This reverts commit f4a5a9ea4d183f4102796215d4502c46dbe3e52b, reversing
changes made to 7ccb482181ee6c47c765406009018a15172812de.

Reason:

The logic is different, the first call to #option_value_selected? is for
the :selected option (the argument is the "selected" variable), the second
call is for the :disabled option (the argument is the "disabled" variable).
2013-11-25 09:32:32 -02:00
Akshay Vishnoi
0f2ef7b929 avoiding calling of #option_value_selected? two times 2013-11-25 15:36:27 +05:30
Rafael Mendonça França
4f28e54424 _implied_layout_name should be private 2013-11-19 22:55:19 -02:00
Rafael Mendonça França
5487f62741 Use the right indentation 2013-11-19 22:53:32 -02:00
Rafael Mendonça França
ed7e4932f4 Renderer#_render_template should be private
Closes #12831
2013-11-19 22:52:06 -02:00
Mac Martine
6251eb992f Improve readability of sentence in partial-renderer docs [ci skip] 2013-11-19 15:46:00 -08:00
Shimpei Makimoto
1e848906c5 Use set_backtrace instead of @backtrace in ActionView error 2013-11-16 04:41:28 +09:00
Rafael Mendonça França
f6f4bed34d Merge pull request #12853 from joshjordan/master
Allocate one less object using html_safe during content_tag construction
2013-11-15 09:45:14 -08:00
Andrey Ognevsky
d04c4fac3b Take Hash with options inside Array in #url_for 2013-11-15 15:50:42 +04:00
Josh Jordan
ea6640d05d Allocate one less object using html_safe during content_tag construction 2013-11-14 23:51:40 -05:00
David Heinemeier Hansson
07996ebc50 Revert "Used Yield instead of block.call" -- this causes all of atom_feed_helper_test.rb to fail with "SystemStackError: stack level too deep".
This reverts commit d3a1ce1cdc60d593de1682c5f4e3230c8db9a0fd.
2013-11-14 15:31:27 -08:00
Rafael Mendonça França
84961dc5df Merge pull request #12889 from kuldeepaggarwal/speed_ups
Used Yield instead of block.call
2013-11-14 11:29:28 -08:00
Kuldeep Aggarwal
d3a1ce1cdc Used Yield instead of block.call 2013-11-15 00:53:57 +05:30
Saulius Grigaliunas
07d99335b3 Fix syntax error in atom_feed example [ci skip]
Builder's #tag! takes either String or Symbol as the first parameter
2013-11-13 13:56:13 +02:00
Rafael Mendonça França
452d746006 Make the method name the first argument
This is the only argument that changes over the method calls so it is
better to it be the first one
2013-11-09 18:28:32 -02:00
Rafael Mendonça França
87d0bde03f Drop one more string allocation 2013-11-09 18:28:32 -02:00
Yves Senn
675304b478 Merge pull request #12760 from pseidemann/master
fix simple_format escapes own output when sanitize is set to true
2013-11-09 04:07:50 -08:00
Vipul A M
5c0b9026ef Extract common code from number helpers to new delegator method. 2013-11-09 07:38:30 +05:30
pseidemann
881a2cc907 fix simple_format escapes own output when sanitize is set to true 2013-11-08 17:13:59 +01:00
Arun Agrawal
daf226abc8 sub! can return nil
Revert "drop one more string allocation"

This reverts commit 4d15661d6c46c86a62ee1fc358f4b3ef9dd9f2ea.
2013-11-07 20:08:32 +01:00
Aaron Patterson
4d15661d6c drop one more string allocation 2013-11-06 14:46:14 -08:00
Aaron Patterson
68b7e381f1 drop string allocations in the log subscriber 2013-11-06 14:37:30 -08:00
Rafael Mendonça França
256ae7dec5 Merge pull request #12788 from kylefritz/patch-1
rdoc: favicon source shouldn't begin with a slash to reference asset pipeline resource [ci skip]
Conflicts:
	actionview/lib/action_view/helpers/asset_tag_helper.rb
2013-11-06 17:38:34 -02:00
David Heinemeier Hansson
2b66f556ed Line up the comments for aesthetics 2013-11-03 12:53:48 -08:00
Carsten Zimmermann
805a6cc564 Convert CDATA input to string before gsub'ing
Rails 3.2 API allowed arbitrary input for cdata_section;
this change re-introduces the old behaviour.
2013-10-29 18:17:57 +01:00
Rafael Mendonça França
86f287e6cf Remove warning of shadowing outer local variable 2013-10-27 20:18:08 -02:00
Rafael Mendonça França
a53f716706 Merge pull request #12636 from kongregate/dont_rescue_Exceptions
Avoid unnecessary catching of Exception instead of StandardError (conver...
2013-10-24 16:48:32 -07:00
stopdropandrew
54f485248c Avoid unnecessary catching of Exception instead of StandardError (converting Exceptions into StandardErrors) 2013-10-24 16:43:27 -07:00
Rafael Mendonça França
6c570648ad Merge pull request #10471 from andyw8/button_to_params
Add params option for button_to

Conflicts:
	actionpack/CHANGELOG.md
2013-10-24 18:02:19 -02:00
Rafael Mendonça França
c44f8d255b Merge pull request #12540 from wyaeld/bug/fix-recursive-digest
Ensure ActionView::Digestor.cache is correctly cleaned up
2013-10-16 19:41:16 -03:00
Adam Jahnke
065d3e061d Fix typo in form_helper.rb 2013-10-16 16:09:09 -05:00
Brad Murray
0cdce7f910 add a new local variable to track if digests are being stored, to ensure the cleanup works correctly 2013-10-17 09:00:37 +13:00
Brad Murray
af1dc7f08a update digestor code based on review 2013-10-15 21:08:47 +13:00
Brad Murray
2b3a349123 Ensure ActionView::Digest.cache is correctly cleaned up when
ActionView::Resolver.caching = false.
2013-10-15 11:17:11 +13:00
Rafael Mendonça França
aa9101eb7e Merge pull request #12491 from shamanime/patch-1
Fix wrong variable name used in the select_day method documentation
2013-10-13 10:13:03 -07:00
Vipul A M
78c176e2fa Change map to map! to save extra array creation on new array 2013-10-13 20:58:50 +05:30
Jefferson Queiroz Venerando
97943f19b7 Fix wrong variable name used in the select_day method documentation
The variable name created in the example is `my_date`, the methods  were using `my_time` instead.
2013-10-10 10:34:14 -03:00
Joseph Zidell
bf495069cb Fixed return strings in documentation 2013-10-03 18:30:42 -04:00
Joseph Zidell
58d64ddc46 Fixed typo in documentation 2013-10-03 16:57:18 -04:00
Thomas von Deyen
1825f6fb60 Adds template dependencies rake task from cache_digests gem.
This adds the rake tasks `cache_digests:dependencies` and `cache_digests:nested_dependencies` from `cache_digests` gem.
2013-09-26 21:19:19 +02:00
Angel N. Sciortino
8ae8044726 Use the given name in html_options for the hidden field in collection_check_boxes 2013-09-24 13:42:06 -05:00
Rafael Mendonça França
dd13722c26 Merge pull request #10773 from wangjohn/link_and_routing_options
Adding documentation and tests to ``polymorphic_url`` and ``link_to``
2013-09-23 12:13:15 -03:00
Bogdan Gusiev
e8e08d69c2 Fix some edge cases for AV select helper with :selected option 2013-09-23 17:48:23 +03:00
Rafael Mendonça França
1c6bcefe7e Expand select documentation to tell about the block
[ci skip]
2013-09-23 11:19:35 -03:00
Bogdan Gusiev
57bf92c6de Ability to pass block to AV#select helper
Example:

    = select(report, "campaign_ids") do
      - available_campaigns.each do |c|
        %option{:data => {:tags => c.tags.to_json}, :value => c.id}= c.name
2013-09-23 14:25:42 +03:00
Vasiliy Ermolovich
0b0ac5d917 handle :namespace form option in collection labels 2013-09-22 21:49:01 +03:00
Daniel Schierbeck
77e79ecd92 Bust the template digest cache key when details are changed
Since the lookup details will influence which template is resolved, they
need to be included in the cache key -- otherwise two different
templates may erroneously share the same digest value.
2013-09-19 10:25:14 +02:00
Andy Waite
e6e0579def Add params option for button_to
The parameters are rendered as hidden form fields within the generated
form. This is useful for when a record has multiple buttons associated
with it, each of which target the same controller method, but which
need to submit different attributes.
2013-09-18 19:56:46 +01:00