Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'spastorino/master' | Carl Lerche | 2010-04-18 | 3 | -3/+5 |
|\ | |||||
| * | Missing require added | Santiago Pastorino | 2010-04-18 | 1 | -0/+1 |
| | | |||||
| * | perform_caching should be accessed through the controller here | Santiago Pastorino | 2010-04-17 | 1 | -1/+1 |
| | | |||||
| * | perform_caching is now delegated to config on instance and class level | Santiago Pastorino | 2010-04-17 | 1 | -2/+3 |
| | | |||||
* | | Merge branch 'master' of github.com:rails/rails | Carl Lerche | 2010-04-18 | 4 | -5/+7 |
|\| | |||||
| * | added shorthand support for routes like /projects/status(.:format) | Diego Carrion | 2010-04-17 | 1 | -3/+3 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | access assigns as a method or hash, with strings or symbols [#4431 ↵ | David Chelimsky | 2010-04-17 | 1 | -2/+2 |
| | | | | | | | | state:resolved] | ||||
| * | Missing requires | wycats | 2010-04-16 | 2 | -0/+2 |
| | | |||||
* | | mail_to with :encode => :javascript now outputs safe html | Sam Elliott | 2010-04-16 | 1 | -1/+1 |
|/ | | | | Signed-off-by: Carl Lerche <carllerche@mac.com> | ||||
* | Revert "Avoid deprecation warnings and potential TypeErrors [#4404 ↵ | Carl Lerche | 2010-04-16 | 3 | -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 Pilkington | 2010-04-16 | 1 | -1/+1 |
| | | | | | | state:committed] Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | page_cache_extension is delegating to config so no need to deprecate | Santiago Pastorino | 2010-04-16 | 1 | -1/+0 |
| | |||||
* | add missing requires to Rescuable and RouteSet [#4415 state:committed] | Mislav Marohnić | 2010-04-16 | 1 | -0/+1 |
| | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | Make perform_caching work again, with the tests passing and backward compatible | Santiago Pastorino and Carl Lerche | 2010-04-15 | 4 | -12/+11 |
| | |||||
* | Revert "logger added to the deprecated config accessor" we need a major ↵ | Santiago Pastorino and Carl Lerche | 2010-04-15 | 1 | -1/+0 |
| | | | | | | refactor to get this working This reverts commit 68f4e046a7f5db3f7c48a3721bead73a625b6f6e. | ||||
* | Avoid deprecation warnings and potential TypeErrors [#4404 state:resolved] | Nicolas Sanguinetti | 2010-04-15 | 2 | -3/+3 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | logger added to the deprecated config accessor | Santiago Pastorino | 2010-04-14 | 1 | -0/+1 |
| | |||||
* | protected instance variables added to the deprecated config accessor | Santiago Pastorino | 2010-04-14 | 1 | -0/+1 |
| | |||||
* | asset and helper path added to the deprecated config accessor | Santiago Pastorino | 2010-04-14 | 1 | -0/+2 |
| | |||||
* | page_cache added to the deprecated config accessor | Santiago Pastorino | 2010-04-14 | 1 | -3/+6 |
| | |||||
* | Make use of config.perform_caching | Santiago Pastorino | 2010-04-14 | 3 | -7/+7 |
| | |||||
* | action_dispatch/routing/deprecated_mapper needs with_options | Matthew Rudy Jacobs | 2010-04-14 | 1 | -0/+1 |
| | | | | | | [#4398 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Fix missing dependency on Hash#to_query | Santiago Pastorino | 2010-04-14 | 1 | -0/+1 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Merge commit 'docrails/master' | Xavier Noria | 2010-04-14 | 1 | -1/+1 |
|\ | |||||
| * | Replace 'RAILS_ROOT' to 'Rails.root' and 'RAILS_ENV' to 'Rails.env' in ↵ | Anil Wadghule | 2010-04-12 | 1 | -1/+1 |
| | | | | | | | | significant places. | ||||
* | | Changed translate helper so that it doesn’t mark every translation as safe ↵ | Craig Davey | 2010-04-13 | 1 | -3/+23 |
| | | | | | | | | | | | | 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 Pastorino | 2010-04-13 | 1 | -1/+2 |
| | | | | | | | | | | | | state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Fix a typo in the documentation. [#4318 state:resolved] | Craig R Webster | 2010-04-12 | 1 | -1/+1 |
| | | | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | | Fix a bug in url generation for generic routes. | José Valim | 2010-04-12 | 1 | -2/+9 |
| | | |||||
* | | Ensure match path, :controller => name works as expected. | José Valim | 2010-04-12 | 1 | -2/+4 |
| | | |||||
* | | Let capture handle the yielding. | José Valim | 2010-04-12 | 1 | -4/+1 |
| | | |||||
* | | Fix ActionMailer test broken in 99d54599215c2a8cea7e57f609e8e578043d71b2 | José Valim | 2010-04-12 | 2 | -5/+11 |
| | | |||||
* | | fields_for returns block result when outside ERB | Ryan Bates | 2010-04-11 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | | Merge branch 'master' of gitproxy:rails/rails | José Valim | 2010-04-11 | 1 | -13/+55 |
|\ \ | |||||
| * | | your beloved typo only spotted in github diff no matter how careful you were ↵ | Xavier Noria | 2010-04-11 | 1 | -1/+1 |
| | | | | | | | | | | | | before pushing | ||||
| * | | second pass to the intro rdoc of form_helper.rb | Xavier Noria | 2010-04-11 | 1 | -13/+55 |
| | | | |||||
* | | | Make namespace work with options[:to] [#4351 state:committed] | Santiago Pastorino | 2010-04-11 | 1 | -0/+8 |
|/ / | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | removes some duplication in previous edit | Xavier Noria | 2010-04-10 | 1 | -5/+0 |
| | | |||||
* | | makes a pass to the intro rdoc of form_helper.rb, will revise form_for tomorrow | Xavier Noria | 2010-04-10 | 1 | -74/+38 |
| | | |||||
* | | form_for :as rubydoc and tidy up a bit the form_for doc | Santiago Pastorino | 2010-04-10 | 1 | -32/+19 |
|/ | |||||
* | Revert "Revert "Use path_names, not resource_path_names, consistently"" | wycats | 2010-04-10 | 1 | -6/+6 |
| | | | This reverts commit d3ec4b1ba6528a081f5124fd71cc026b1f8abe9c. | ||||
* | Update versions (otherwise you install a gem from source as beta3 but ↵ | José Valim | 2010-04-10 | 1 | -1/+1 |
| | | | | internally it's beta2) and update CHANGELOG. | ||||
* | Remove error_messages_for data from locale. | José Valim | 2010-04-10 | 1 | -8/+0 |
| | |||||
* | Move verification to a plugin as well: http://github.com/rails/verification.git | José Valim | 2010-04-10 | 5 | -143/+21 |
| | |||||
* | Remove input, form, error_messages_for and error_message_on from the ↵ | José Valim | 2010-04-10 | 2 | -273/+20 |
| | | | | 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é Valim | 2010-04-10 | 1 | -6/+6 |
| | | | | | Breaks tests on Ruby 1.8.7. This reverts commit 13bbf98d85029fd4e3563ac46413c7b72625bc25. | ||||
* | Use path_names, not resource_path_names, consistently | wycats | 2010-04-10 | 1 | -6/+6 |
| | |||||
* | Dial back from 'namespace :controller => ...' to 'scope :module => ...' | Jeremy Kemper | 2010-04-09 | 1 | -17/+5 |
| | |||||
* | Routes can be selectively namespaced by path or controller module | Jeremy Kemper | 2010-04-09 | 1 | -2/+15 |
| | |||||
* | fix stack trace lines on class_eval | Santiago Pastorino | 2010-04-09 | 2 | -3/+3 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> |