aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* 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
|
* Dial back from 'namespace :controller => ...' to 'scope :module => ...'Jeremy Kemper2010-04-093-35/+13
|
* Add test showing root match in path namespaceJeremy Kemper2010-04-091-0/+4
|
* Routes can be selectively namespaced by path or controller moduleJeremy Kemper2010-04-093-3/+57
|
* fix stack trace lines on class_evalSantiago Pastorino2010-04-093-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 Noria2010-04-092-11/+14
| | | | path_to_image in rdoc
* Stray carrier returnsDavid Heinemeier Hansson2010-04-091-2/+0
|
* Layout contents are html-safeJeremy Kemper2010-04-091-1/+1
|
* adds an entry for #favicon_link_tag in AP's CHANGELOGXavier Noria2010-04-091-0/+2
|
* Expect an incompatible encoding exception when a template with a magic ↵Jeremy Kemper2010-04-086-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 Kemper2010-04-083-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 Noria2010-04-082-0/+46
| | | | a link for Mobile Safari with it
* Fixed that default locale templates should be used if the current locale ↵Carl Lerche2010-04-085-2/+28
| | | | template is missing [DHH]
* Add accessors for request and response so tests don't have to mess with ↵Michael Koziarski2010-04-092-0/+8
| | | | internal ivars
* Consistently use lowercase instead of camelCase for all JS class names in RailsDavid Heinemeier Hansson2010-04-083-25/+25
|
* Revert "adds #favicon_link_tag and #apple_touch_icon_link_tag" -- these tags ↵David Heinemeier Hansson2010-04-083-66/+0
| | | | | | are too specific. This reverts commit 6891f46d10957f21f200fc4dc2b6076ff411b1da, ec8610cfdc32d0fe816fb22405e00ef1b6c90d73, and d18ff1b7efd96e7c08bc1a15137735be45f87e07.
* Remove superfluous conditionJeremy Kemper2010-04-081-1/+1
|
* Merge branch 'master' of github.com:rails/railsJeremy Kemper2010-04-086-4/+74
|\
| * Fix a bug in ActionDispatch::Static where Rails cannot find assets if ↵José Valim2010-04-083-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 CHANGELOGXavier Noria2010-04-071-0/+2
| |
| * adds a default source to #apple_touch_icon_link_tagXavier Noria2010-04-072-6/+13
| |