aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* escape assigns[:person], assigns[person] etc in actioncontroller testcaseNick Howard2011-12-141-3/+3
|
* Merge pull request #3970 from lest/backtrace-when-silencedJosé Valim2011-12-131-1/+4
|\ | | | | log exception backtrace when all backtrace lines silenced
| * log exception backtrace when all backtrace lines silencedSergey Nartimov2011-12-131-1/+4
| |
* | locale and default_locale may be the same, so uniq the arrayAaron Patterson2011-12-131-1/+1
| |
* | stop freezing the details hashAaron Patterson2011-12-131-2/+1
| |
* | stop freezing hash valueAaron Patterson2011-12-131-1/+1
|/
* use Array#join so that file encoding doesn't impact returned string.Aaron Patterson2011-12-121-3/+3
| | | | Fixes #3957
* logger adds a newline for usAaron Patterson2011-12-121-1/+0
|
* Merge pull request #3943 from sferik/add_explicit_requiresJosé Valim2011-12-122-2/+1
|\ | | | | Include TagHelper but don't explicitly require it
| * Include TagHelper but don't explicitly require itErik Michaels-Ober2011-12-122-2/+1
| | | | | | | | Allow autoloading to work as intended and avoid multiple requires.
* | Allow reloader to be configured.José Valim2011-12-121-14/+38
| |
* | Default relative_url_root to ENV["RAILS_RELATIVE_URL_ROOT"]. Fixes #3365Piotrek Okoński2011-12-122-1/+2
|/
* Added :use_two_digit_numbers option [Lennart Fridén & Kim Persson]Lennart Fridén2011-12-111-3/+6
| | | | | | | | | | Added use_two_digit_numbers select_tag option for displaying months and days with leading zeros without affecting the values (useful for e.g. ISO-style dates, 2011-08-01). Signed-off-by: José Valim <jose.valim@gmail.com> Conflicts: actionpack/CHANGELOG.md
* Merge pull request #3933 from wfarr/masterJosé Valim2011-12-112-0/+39
|\ | | | | Add button_tag support to ActionView::Helpers::FormBuilder
| * Add button_tag support to ActionView::Helpers::FormBuilder.Will Farrington2011-12-112-0/+39
| | | | | | | | | | | | | | | | | | | | This support is near-identical to the existing submit_tag support. Example: <%= form_for @post do |f| %> <%= f.button %> <% end %>
* | Use ProcessedAsset#pathname in Sprockets helpers when debugging is on. ↵Guillermo Iguaran2011-12-101-3/+3
|/ | | | | | Closes #3333 #3348 #3361. Is wrong use ProcessedAsset#to_s since it returns the content of the file.
* Update partials documentation, partial_path is no longer generated using ↵Piotr Sarnacki2011-12-101-10/+13
| | | | RecordIdentifier
* Fix extend -> include.José Valim2011-12-092-3/+1
|
* Make ActiveSupport::Benchmarkable a default module for ↵David Heinemeier Hansson2011-12-091-0/+2
| | | | ActionController::Base, so the #benchmark method is once again available in the controller context like it used to be *DHH*
* Deprecate implicit layout lookup in favor of inheriting the _layout config.José Valim2011-12-091-32/+86
|
* Simplify path traversal logicJosé Valim2011-12-091-7/+7
|
* load the encoding converter to work around [ruby-core:41556] when switching ↵Aaron Patterson2011-12-082-115/+0
| | | | encodings
* Fix another regression related to the layout optimization.José Valim2011-12-081-0/+2
|
* Move symbolize keys to the inner options as we can assume url_options will ↵José Valim2011-12-082-2/+2
| | | | be properly symbolized.
* Fix a regression and also fix broken test.José Valim2011-12-081-4/+9
|
* Improve cache on route_key lookup.José Valim2011-12-081-4/+6
|
* Revert accidental change from cattr_accessor to class_attribute.José Valim2011-12-081-1/+1
|
* Just use the proc if there is a chance of layout lookup.José Valim2011-12-081-5/+6
|
* Optimize layout lookup to avoid double calls.José Valim2011-12-084-33/+41
|
* Some small optimizations and improvements to benchmark code.José Valim2011-12-083-16/+11
|
* Merge pull request #3900 from jfturcot/accessible_wrap_paramsJosé Valim2011-12-081-1/+8
|\ | | | | ParamsWrapper only wrap the accessible attributes when they were set
| * ParamsWrapper only wrap the accessible attributes when they were setJean-Francois Turcot2011-12-071-1/+8
| |
* | Remove dead broken code from AD::RequestJosé Valim2011-12-081-8/+0
| |
* | Merge pull request #3888 from kennyj/should_use_default_charsetJosé Valim2011-12-081-0/+1
|\ \ | |/ |/| Assign config.encoding to AD::Response.default_charset at the initialization time.
| * Assign config.encoding to AD::Response.default_charset at the initialization ↵kennyj2011-12-071-0/+1
| | | | | | | | time.
* | Remove #:nodoc: from partial renderer.José Valim2011-12-071-1/+1
| |
* | Use freezed string constant. Some string literals is used repeatedly.kennyj2011-12-083-24/+40
| |
* | Merge pull request #3884 from sikachu/master-fix_layoutJosé Valim2011-12-072-38/+49
|\ \ | | | | | | Allow layout fallback when using `layout` method
| * | Allow layout fallback when using `layout` methodPrem Sichanugrist2011-12-061-25/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails will now use your default layout (such as "layouts/application") when you specify a layout with `:only` and `:except` condition, and those conditions fail. For example, consider this snippet: class CarsController layout 'single_car', :only => :show end Rails will use 'layouts/single_car' when a request comes in `:show` action, and use 'layouts/application' (or 'layouts/cars', if exists) when a request comes in for any other actions.
| * | Fix bug in assert_template when using only `:layout` optionPrem Sichanugrist2011-12-061-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if you're do this: assert_template :layout => "foo" Regardless of what layout you were using, the test will always pass. This was broken since the introduction of :layout option in [d9375f3f]. We have a lot of test cases in actionpack/test/controller/layout_test.rb that use this feature. This will make sure that those test cases are not true negative.
* | | Merge pull request #3878 from kennyj/should_use_default_charsetJosé Valim2011-12-071-1/+1
|\ \ \ | |/ / |/| / | |/ Use default charset when we read content type without charset.
| * Use default charset when we read content type without charset.kennyj2011-12-071-1/+1
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-061-4/+4
|\ \ | |/ |/|
| * Use do end for multiline block.Uģis Ozols2011-12-051-2/+2
| |
| * .rhtml and .rxml was removed in Rails 3.Uģis Ozols2011-12-051-2/+2
| |
* | Merge pull request #3428 from adrianpike/asset_path_conflictsSantiago Pastorino2011-12-061-8/+9
|\ \ | | | | | | Issue #3427 - asset_path_conflicts
| * | Let's do the same trick for asset_path that we do for ↵Adrian Pike2011-12-051-8/+9
| | | | | | | | | | | | | | | | | | [image,javascript,stylesheet]_path to avoid namespace conflicts on named routes. Closes #3427
* | | Allowing string as url argument for expire_actionThomas von Deyen2011-12-061-3/+2
|/ /
* | Merge pull request #3861 from andyjeffries/masterJosé Valim2011-12-051-1/+1
|\ \ | | | | | | Named Routes shouldn't override existing ones (currently route recognition goes with the earliest match, named routes use the latest match)
| * | Named Routes shouldn't override existing ones (currently route recognition ↵Andy Jeffries2011-12-051-1/+1
| | | | | | | | | | | | goes with the earliest match, named routes use the latest match)