aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Missing requireswycats2010-04-162-0/+2
|
* Revert "Avoid deprecation warnings and potential TypeErrors [#4404 ↵Carl Lerche2010-04-163-4/+3
| | | | | | | state:resolved]" Revert "protected instance variables added to the deprecated config accessor This reverts commit 4bce5ba600596b5e7afec9b097866ac259c5940a and 0ee2d3c89a893f0c53924cbb756c7e9be616eb8f.
* Mark the result of grouped_options_for_select as HTML safe [#4322 ↵Kieran Pilkington2010-04-162-1/+5
| | | | | | state:committed] Signed-off-by: Xavier Noria <fxn@hashref.com>
* Bump rack-mount dependency to ~> 0.6.3 for CRITICAL FIXJeremy Kemper2010-04-161-1/+1
|
* Revert "Require rack-mount 0.6.0 since 0.6.1 and later can't be bundled"Jeremy Kemper2010-04-161-1/+1
| | | | | | They can be bundled. Just the git repos can't. Use rails/rack-mount for that. This reverts commit ef6cdc974f7c3d98eb0a3ad65761e10600f04110.
* page_cache_extension is delegating to config so no need to deprecateSantiago Pastorino2010-04-161-1/+0
|
* Added test get to js should have a header with content-type text/javascriptSantiago Pastorino2010-04-161-1/+8
|
* Tidy up a bit this test fileSantiago Pastorino2010-04-161-7/+2
|
* Revert "Add test case which check content type when rendering rjs" partial ↵Santiago Pastorino2010-04-161-9/+1
| | | | | | in html template" rendering rjs in html doesn't make sense, it would just output javascript into the template, no script tag This reverts commit dc251389d1ab4303b80a22642f4241940b73cbe7.
* add missing requires to Rescuable and RouteSet [#4415 state:committed]Mislav Marohnić2010-04-161-0/+1
| | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
* Make perform_caching work again, with the tests passing and backward compatibleSantiago Pastorino and Carl Lerche2010-04-156-26/+25
|
* Revert "logger added to the deprecated config accessor" we need a major ↵Santiago Pastorino and Carl Lerche2010-04-151-1/+0
| | | | | | refactor to get this working This reverts commit 68f4e046a7f5db3f7c48a3721bead73a625b6f6e.
* Avoid deprecation warnings and potential TypeErrors [#4404 state:resolved]Nicolas Sanguinetti2010-04-152-3/+3
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* logger added to the deprecated config accessorSantiago Pastorino2010-04-141-0/+1
|
* protected instance variables added to the deprecated config accessorSantiago Pastorino2010-04-141-0/+1
|
* asset and helper path added to the deprecated config accessorSantiago Pastorino2010-04-141-0/+2
|
* page_cache added to the deprecated config accessorSantiago Pastorino2010-04-141-3/+6
|
* Make use of config.perform_cachingSantiago Pastorino2010-04-143-7/+7
|
* action_dispatch/routing/deprecated_mapper needs with_optionsMatthew Rudy Jacobs2010-04-141-0/+1
| | | | | | [#4398 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Fix missing dependency on Hash#to_querySantiago Pastorino2010-04-141-0/+1
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Require rack-mount 0.6.0 since 0.6.1 and later can't be bundledJeremy Kemper2010-04-141-1/+1
|
* Merge commit 'docrails/master'Xavier Noria2010-04-141-1/+1
|\
| * Replace 'RAILS_ROOT' to 'Rails.root' and 'RAILS_ENV' to 'Rails.env' in ↵Anil Wadghule2010-04-121-1/+1
| | | | | | | | significant places.
* | Changed translate helper so that it doesn’t mark every translation as safe ↵Craig Davey2010-04-134-5/+45
| | | | | | | | | | | | HTML. Only keys with a "_html" suffix and keys named "html" are considered to be safe HTML. All other translations are left untouched. Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* | config.perform_caching added to the deprecated config accessor [#4383 ↵Santiago Pastorino2010-04-131-1/+2
| | | | | | | | | | | | state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Merge branch 'master' of github.com:rails/railswycats2010-04-132-2/+2
|\ \
| * | Use correct RUBY_PLATFORM regex for Windows env [#4385 state:resolved]Anil Wadghule2010-04-131-1/+1
| | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * | Update changelogs for releaseDavid Heinemeier Hansson2010-04-131-1/+1
| | |
* | | Add test case which check content type when rendering rjs partial in html ↵Stanko Alexander2010-04-131-1/+9
|/ / | | | | | | | | | | template Signed-off-by: wycats <wycats@gmail.com>
* | Add a test that used to fail but is fixed now [#3417 state:resolved]wycats2010-04-121-0/+1
| |
* | Fix a typo in the documentation. [#4318 state:resolved]Craig R Webster2010-04-121-1/+1
| | | | | | Signed-off-by: wycats <wycats@gmail.com>
* | Fix a bug in url generation for generic routes.José Valim2010-04-122-2/+21
| |
* | Ensure match path, :controller => name works as expected.José Valim2010-04-122-2/+13
| |
* | Let capture handle the yielding.José Valim2010-04-121-4/+1
| |
* | Fix ActionMailer test broken in 99d54599215c2a8cea7e57f609e8e578043d71b2José Valim2010-04-122-5/+11
| |
* | fields_for returns block result when outside ERBRyan Bates2010-04-112-1/+6
| | | | | | | | Signed-off-by: wycats <wycats@gmail.com>
* | Merge branch 'master' of gitproxy:rails/railsJosé Valim2010-04-111-13/+55
|\ \
| * | your beloved typo only spotted in github diff no matter how careful you were ↵Xavier Noria2010-04-111-1/+1
| | | | | | | | | | | | before pushing
| * | second pass to the intro rdoc of form_helper.rbXavier Noria2010-04-111-13/+55
| | |
* | | Make namespace work with options[:to] [#4351 state:committed]Santiago Pastorino2010-04-112-2/+10
|/ / | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | removes some duplication in previous editXavier Noria2010-04-101-5/+0
| |
* | makes a pass to the intro rdoc of form_helper.rb, will revise form_for tomorrowXavier Noria2010-04-101-74/+38
| |
* | form_for :as rubydoc and tidy up a bit the form_for docSantiago Pastorino2010-04-102-32/+21
|/
* Revert "Revert "Use path_names, not resource_path_names, consistently""wycats2010-04-101-6/+6
| | | This reverts commit d3ec4b1ba6528a081f5124fd71cc026b1f8abe9c.
* Update versions (otherwise you install a gem from source as beta3 but ↵José Valim2010-04-102-1/+7
| | | | internally it's beta2) and update CHANGELOG.
* Remove error_messages_for data from locale.José Valim2010-04-101-8/+0
|
* Move verification to a plugin as well: http://github.com/rails/verification.gitJosé Valim2010-04-106-413/+21
|
* Remove input, form, error_messages_for and error_message_on from the ↵José Valim2010-04-105-636/+32
| | | | framework. If you think you will miss them, feel free to use the dynamic_form plugin available at http://github.com/rails/dynamic_form
* Revert "Use path_names, not resource_path_names, consistently"José Valim2010-04-101-6/+6
| | | | | Breaks tests on Ruby 1.8.7. This reverts commit 13bbf98d85029fd4e3563ac46413c7b72625bc25.
* Use path_names, not resource_path_names, consistentlywycats2010-04-101-6/+6
|