Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Changed translate helper so that it doesn’t mark every translation as safe ↵ | Craig Davey | 2010-04-13 | 4 | -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 Pastorino | 2010-04-13 | 1 | -1/+2 |
| | | | | | | state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Merge branch 'master' of github.com:rails/rails | wycats | 2010-04-13 | 2 | -2/+2 |
|\ | |||||
| * | Use correct RUBY_PLATFORM regex for Windows env [#4385 state:resolved] | Anil Wadghule | 2010-04-13 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Update changelogs for release | David Heinemeier Hansson | 2010-04-13 | 1 | -1/+1 |
| | | |||||
* | | Add test case which check content type when rendering rjs partial in html ↵ | Stanko Alexander | 2010-04-13 | 1 | -1/+9 |
|/ | | | | | | template Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Add a test that used to fail but is fixed now [#3417 state:resolved] | wycats | 2010-04-12 | 1 | -0/+1 |
| | |||||
* | 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 | 2 | -2/+21 |
| | |||||
* | Ensure match path, :controller => name works as expected. | José Valim | 2010-04-12 | 2 | -2/+13 |
| | |||||
* | 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 | 2 | -1/+6 |
| | | | | 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 | 2 | -2/+10 |
|/ | | | | 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 | 2 | -32/+21 |
| | |||||
* | 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 | 2 | -1/+7 |
| | | | | 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 | 6 | -413/+21 |
| | |||||
* | Remove input, form, error_messages_for and error_message_on from the ↵ | José Valim | 2010-04-10 | 5 | -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é 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 | 3 | -35/+13 |
| | |||||
* | Add test showing root match in path namespace | Jeremy Kemper | 2010-04-09 | 1 | -0/+4 |
| | |||||
* | Routes can be selectively namespaced by path or controller module | Jeremy Kemper | 2010-04-09 | 3 | -3/+57 |
| | |||||
* | fix stack trace lines on class_eval | Santiago Pastorino | 2010-04-09 | 3 | -5/+5 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | image_path -> path_to_image in a couple of places, plus motivation for ↵ | Xavier Noria | 2010-04-09 | 2 | -11/+14 |
| | | | | path_to_image in rdoc | ||||
* | Stray carrier returns | David Heinemeier Hansson | 2010-04-09 | 1 | -2/+0 |
| | |||||
* | Layout contents are html-safe | Jeremy Kemper | 2010-04-09 | 1 | -1/+1 |
| | |||||
* | adds an entry for #favicon_link_tag in AP's CHANGELOG | Xavier Noria | 2010-04-09 | 1 | -0/+2 |
| | |||||
* | Expect an incompatible encoding exception when a template with a magic ↵ | Jeremy Kemper | 2010-04-08 | 6 | -4/+23 |
| | | | | comment renders a partial without one and its source encoding doesn't match the default external encoding | ||||
* | Expect an incompatible encoding exception when a template doesn't have a ↵ | Jeremy Kemper | 2010-04-08 | 3 | -27/+38 |
| | | | | magic comment and its source encoding doesn't match the default external encoding | ||||
* | adds #favicon_link_tag back, rdoc explains why it is useful, and how to get ↵ | Xavier Noria | 2010-04-08 | 2 | -0/+46 |
| | | | | a link for Mobile Safari with it | ||||
* | Fixed that default locale templates should be used if the current locale ↵ | Carl Lerche | 2010-04-08 | 5 | -2/+28 |
| | | | | template is missing [DHH] | ||||
* | Add accessors for request and response so tests don't have to mess with ↵ | Michael Koziarski | 2010-04-09 | 2 | -0/+8 |
| | | | | internal ivars | ||||
* | Consistently use lowercase instead of camelCase for all JS class names in Rails | David Heinemeier Hansson | 2010-04-08 | 3 | -25/+25 |
| | |||||
* | Revert "adds #favicon_link_tag and #apple_touch_icon_link_tag" -- these tags ↵ | David Heinemeier Hansson | 2010-04-08 | 3 | -66/+0 |
| | | | | | | are too specific. This reverts commit 6891f46d10957f21f200fc4dc2b6076ff411b1da, ec8610cfdc32d0fe816fb22405e00ef1b6c90d73, and d18ff1b7efd96e7c08bc1a15137735be45f87e07. | ||||
* | Remove superfluous condition | Jeremy Kemper | 2010-04-08 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of github.com:rails/rails | Jeremy Kemper | 2010-04-08 | 6 | -4/+74 |
|\ | |||||
| * | Fix a bug in ActionDispatch::Static where Rails cannot find assets if ↵ | José Valim | 2010-04-08 | 3 | -4/+8 |
| | | | | | | | | started in another directory which is not the RAILS_ROOT. | ||||
| * | adds #favicon_link_tag and #apple_touch_icon_link_tag to AP's CHANGELOG | Xavier Noria | 2010-04-07 | 1 | -0/+2 |
| | | |||||
| * | adds a default source to #apple_touch_icon_link_tag | Xavier Noria | 2010-04-07 | 2 | -6/+13 |
| | | |||||
| * | new helpers #favicon_link_tag and #apple_touch_icon_link_tag | Xavier Noria | 2010-04-07 | 2 | -0/+57 |
| | | |||||
* | | Use request.body IO and rewind, if possible | Jeremy Kemper | 2010-04-07 | 1 | -3/+6 |
| | | |||||
* | | Remove #size call on rack input io | Joshua Peek | 2010-04-07 | 1 | -8/+4 |
|/ |