aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mainstream/master'Pratik Naik2010-02-1414-22/+51
|\
| * simple_format returns a safe buffer escaping unsafe input [Santiago Pastorino]David Heinemeier Hansson2010-02-121-1/+1
| * Safely concat the ending tag to simple_format or it will be escapedDavid Heinemeier Hansson2010-02-121-1/+1
| * Its not a deprecation if you actually just ignore the callDavid Heinemeier Hansson2010-02-091-0/+2
| * Fix pluralization for numbers formatted like '1.00'Gabriel Mansour2010-02-071-1/+1
| * Fix nested attributes with specified collection.José Valim2010-02-071-7/+11
| * Fix tiny version number from '3.0.0beta' to '3.0.0.beta1', so 'rake install' ...Prem Sichanugrist2010-02-061-1/+1
| * Routes should not swallow all NameErrors [#3862 status:resolved].José Valim2010-02-061-1/+2
| * Lookup the status code and rework the Completed line a bitDavid Heinemeier Hansson2010-02-051-2/+1
| * More html_safe strings now use the safe_concat methodSantiago Pastorino and José Ignacio Costa2010-02-055-7/+7
| * Make UrlWriter includable in a ModuleJeremy Kemper2010-02-051-1/+9
| * HTML-escape csrf meta contentsJeremy Kemper2010-02-041-1/+1
| * Expose CSRF param name alsoJeremy Kemper2010-02-041-1/+1
| * Expose CSRF tag for UJS adaptersJeremy Kemper2010-02-042-0/+14
| * Rationalize railtie dependencies: AC uses AV; AR uses AMo; and Rails always u...Jeremy Kemper2010-02-041-0/+1
* | Remove outdated docs.José Valim2010-02-091-14/+0
* | revises an example in the rdoc of TextHelper#concatXavier Noria2010-02-061-1/+1
* | Merge remote branch 'mainstream/master'Pratik Naik2010-02-045-24/+10
|\|
| * Move to 3.0.0.betaDavid Heinemeier Hansson2010-02-031-1/+1
| * Add method and path to AC notifications.José Valim2010-02-031-1/+3
| * Routing Mapper with % interpolation on Ruby 1.9.1 fixed [#3837 status:resolved]Santiago Pastorino and José Ignacio Costa2010-02-021-2/+1
| * Configuration values should be on AV::Base.José Valim2010-02-021-17/+4
| * Modify the behavior of `radio_button_tag` to use `sanitize_to_id` for consist...Prem Sichanugrist2010-02-021-3/+1
* | Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-02-025-109/+51
|\|
| * Make rdoc match current APISam Ruby2010-02-021-105/+47
| * Resolve view paths correctly on CygWinSam Ruby2010-02-021-1/+1
| * Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-02-0236-182/+147
| |\
| * | Updating copyright dates on all licensesMikel Lindsaar2010-02-013-3/+3
* | | Merge remote branch 'mainstream/master'Pratik Naik2010-02-0137-219/+235
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of gitproxy:rails/railsJosé Valim2010-02-0113-40/+72
| |\ \
| | * | Convert to class_attributeJeremy Kemper2010-02-0113-40/+72
| * | | Deprecate AC configuration values which were moved to Rack.José Valim2010-02-011-6/+22
| |/ /
| * | Add support for compile-time <%= raw %>Yehuda Katz2010-01-311-1/+5
| * | Deleted all references to ActionView::SafeBuffer in favor of ActiveSupport::S...Santiago Pastorino2010-01-313-4/+2
| * | action_view/safe_buffer is no longer validSantiago Pastorino2010-01-311-1/+0
| * | action_view is requiring the deleted action_view/erb/util.rb fileSantiago Pastorino2010-01-311-1/+0
| * | For performance reasons, you can no longer call html_safe! on Strings. Instea...Yehuda Katz2010-01-3121-131/+48
| |/
| * UJS documentation.Stefan Penner2010-01-313-33/+78
| * data-remote needs to be on the form and not the submit when using button_to :...Erik St. Martin2010-01-311-1/+3
| * add :remote option to form_tagStephen St. Martin2010-01-311-0/+1
| * form_for should pass :remote to form_tag through html_optionsStephen St. Martin2010-01-311-0/+2
| * Require ac/test_case from AV::TestCaseJoshua Peek2010-01-311-0/+2
| * deOMGifying Railties, Active Support, and Action PackMikel Lindsaar2010-01-312-3/+2
* | Merge remote branch 'mainstream/master'Pratik Naik2010-01-3125-1254/+493
|\|
| * Improve missing template error messages a little bit.José Valim2010-01-312-7/+12
| * Add rel=nofollow on non get remote linksJoshua Peek2010-01-301-1/+1
| * Generate UJS code for :disable_withJoshua Peek2010-01-302-14/+1
| * updating link_to and button_to to support :remote => true and other options s...Erik St. Martin2010-01-302-38/+51
| * Include prototype ujs adapter with new appsJoshua Peek2010-01-301-1/+1
| * Reorg options_for_javascript and array_or_string_for_javascriptJoshua Peek2010-01-303-17/+17