aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'technoweenie/http_token_authentication'Jeremy Kemper2010-04-302-0/+159
|\
| * add HTTP Token Authorization support to complement Basic and Digest Authoriza...rick2010-04-302-0/+159
* | Merge branch 'master' of github.com:rails/railswycats2010-04-304-48/+37
|\|
| * removing the extra assignment statement [#4432 state:resolved]Neeraj Singh2010-04-301-1/+0
| * Fix form builder and form helpers inconsistencies [#4432 state:resolved]Neeraj Singh2010-04-291-43/+33
| * ActionCachingTestController rescues from all exceptions. Making sure that all...Neeraj Singh2010-04-291-1/+1
| * Fix prototype grep depending on JSON encoding regexp as JavaScript regexpJeremy Kemper2010-04-271-1/+1
| * Only run load hooks once a file has been fully loaded.Nathan Weizenbaum2010-04-271-2/+2
* | Merge branch 'master' of github.com:rails/railswycats2010-04-2619-334/+238
|\|
| * extract ActionController::TestCase::BehaviorDavid Chelimsky2010-04-261-126/+133
| * allow unsubscribe by name or subscription [#4433 state:resolved]David Chelimsky2010-04-241-0/+1
| * Rename fieldWithErrors style to field_with_errors. Remove unused alert style.Jeremy Kemper2010-04-241-1/+1
| * HWIA symbolize_keys now returns a hash so no need to do this anymoreSantiago Pastorino2010-04-221-1/+1
| * Make ActionDispatch url_for use HWIA symbolize_keysSantiago Pastorino2010-04-221-1/+1
| * Ensure that url_for uses symbolized keys in the controller. [#4391]J Smith2010-04-221-1/+1
| * Always downstream given options in :json, :xml and :js renderers and add test...José Valim2010-04-221-2/+2
| * Clean up the config object in ActionPack. Create config_accessor which just d...José Valim2010-04-2214-203/+99
* | Allow :remote => false to be passed to link_toNicolas Sanguinetti2010-04-221-3/+1
|/
* url_for now works with HashWithIndifferentAccess ht jay [#4391 state:committed]Santiago Pastorino2010-04-211-1/+1
* Some require indifferent_access addedSantiago Pastorino2010-04-214-1/+5
* require without .rbSantiago Pastorino2010-04-211-1/+1
* It should be possible to render :json with optionswycats2010-04-201-1/+1
* Remove only formats in shortcuts and do it just once.José Valim2010-04-201-4/+5
* Merge remote branch 'spastorino/master'Carl Lerche2010-04-183-3/+5
|\
| * Missing require addedSantiago Pastorino2010-04-181-0/+1
| * perform_caching should be accessed through the controller hereSantiago Pastorino2010-04-171-1/+1
| * perform_caching is now delegated to config on instance and class levelSantiago Pastorino2010-04-171-2/+3
* | Merge branch 'master' of github.com:rails/railsCarl Lerche2010-04-184-5/+7
|\|
| * added shorthand support for routes like /projects/status(.:format)Diego Carrion2010-04-171-3/+3
| * access assigns as a method or hash, with strings or symbols [#4431 state:reso...David Chelimsky2010-04-171-2/+2
| * Missing requireswycats2010-04-162-0/+2
* | mail_to with :encode => :javascript now outputs safe htmlSam Elliott2010-04-161-1/+1
|/
* Revert "Avoid deprecation warnings and potential TypeErrors [#4404 state:reso...Carl Lerche2010-04-163-4/+3
* Mark the result of grouped_options_for_select as HTML safe [#4322 state:commi...Kieran Pilkington2010-04-161-1/+1
* page_cache_extension is delegating to config so no need to deprecateSantiago Pastorino2010-04-161-1/+0
* add missing requires to Rescuable and RouteSet [#4415 state:committed]Mislav Marohnić2010-04-161-0/+1
* Make perform_caching work again, with the tests passing and backward compatibleSantiago Pastorino and Carl Lerche2010-04-154-12/+11
* Revert "logger added to the deprecated config accessor" we need a major refac...Santiago Pastorino and Carl Lerche2010-04-151-1/+0
* Avoid deprecation warnings and potential TypeErrors [#4404 state:resolved]Nicolas Sanguinetti2010-04-152-3/+3
* 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
* Fix missing dependency on Hash#to_querySantiago Pastorino2010-04-141-0/+1
* Merge commit 'docrails/master'Xavier Noria2010-04-141-1/+1
|\
| * Replace 'RAILS_ROOT' to 'Rails.root' and 'RAILS_ENV' to 'Rails.env' in signif...Anil Wadghule2010-04-121-1/+1
* | Changed translate helper so that it doesn’t mark every translation as safe ...Craig Davey2010-04-131-3/+23
* | config.perform_caching added to the deprecated config accessor [#4383 state:c...Santiago Pastorino2010-04-131-1/+2