aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* 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-113-4/+27
* Merge pull request #3933 from wfarr/masterJosé Valim2011-12-114-1/+52
|\
| * Add button_tag support to ActionView::Helpers::FormBuilder.Will Farrington2011-12-114-1/+52
* | Use ProcessedAsset#pathname in Sprockets helpers when debugging is on. Closes...Guillermo Iguaran2011-12-101-3/+3
|/
* Update partials documentation, partial_path is no longer generated using Reco...Piotr Sarnacki2011-12-101-10/+13
* Fix extend -> include.José Valim2011-12-092-3/+1
* only load converter if the encodings are differentAaron Patterson2011-12-091-1/+1
* Make ActiveSupport::Benchmarkable a default module for ActionController::Base...David Heinemeier Hansson2011-12-092-0/+4
* Deprecate implicit layout lookup in favor of inheriting the _layout config.José Valim2011-12-093-34/+101
* Simplify path traversal logicJosé Valim2011-12-091-7/+7
* load the encoding converter to work around [ruby-core:41556] when switching e...Aaron Patterson2011-12-083-115/+1
* Fix another regression related to the layout optimization.José Valim2011-12-082-1/+27
* Move symbolize keys to the inner options as we can assume url_options will be...José Valim2011-12-082-2/+2
* Fix a regression and also fix broken test.José Valim2011-12-082-9/+14
* 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
* Merge pull request #3906 from kennyj/fix_warnings_for_params_wrapper_testJosé Valim2011-12-081-1/+1
|\
| * Fix warning for params_wrapper_test.kennyj2011-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-084-17/+15
* | Add performance scripts from wycats/rails-simple-benches to actionpack.José Valim2011-12-089-0/+216
|/
* Merge pull request #3900 from jfturcot/accessible_wrap_paramsJosé Valim2011-12-083-2/+41
|\
| * Add information to the changelog about the changes to ActionController::Param...Jean-Francois Turcot2011-12-081-0/+5
| * ParamsWrapper only wrap the accessible attributes when they were setJean-Francois Turcot2011-12-072-2/+36
* | 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 ...kennyj2011-12-071-0/+1
* | 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-076-40/+125
|\ \
| * | Allow layout fallback when using `layout` methodPrem Sichanugrist2011-12-063-26/+93
| * | Fix bug in assert_template when using only `:layout` optionPrem Sichanugrist2011-12-063-14/+32
* | | Merge pull request #3878 from kennyj/should_use_default_charsetJosé Valim2011-12-072-1/+12
|\ \ \ | |/ / |/| / | |/
| * Use default charset when we read content type without charset.kennyj2011-12-072-1/+12
* | 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
* | Sync AP CHANGELOG with 3-1-stableSantiago Pastorino2011-12-061-0/+8
* | Merge pull request #3428 from adrianpike/asset_path_conflictsSantiago Pastorino2011-12-062-8/+66
|\ \
| * | Let's do the same trick for asset_path that we do for [image,javascript,style...Adrian Pike2011-12-052-8/+66
* | | Allowing string as url argument for expire_actionThomas von Deyen2011-12-062-3/+22
|/ /
* | Merge pull request #3861 from andyjeffries/masterJosé Valim2011-12-052-3/+3
|\ \
| * | Named Routes shouldn't override existing ones (currently route recognition go...Andy Jeffries2011-12-052-3/+3
* | | use classify in ParamsWrapper to derive model name from controller namelest2011-12-052-1/+36
|/ /
* | Minor enhancement by not unnecessarely escaping forward slashing within a cur...Overbryd2011-12-051-1/+2
* | Fix for redirect_to to respect urls with a network path reference like "//ass...Overbryd2011-12-052-2/+12
* | form_for with +:as+ option uses "action_as" as css class and idVasiliy Ermolovich2011-12-043-13/+25
|/
* Fix failing cascade exception.José Valim2011-12-033-2/+12