aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1165 from arunagw/rubyforge_removeJosé Valim2011-05-211-1/+0
|\ | | | | Not updating rubyforge for new versions.
| * Not updating rubyforge for new versions. Result of "gem list -d rails" is ↵Arun Agrawal2011-05-201-1/+0
| | | | | | | | not useful.
* | Correct example and expand on description of :shallow option for resourcesAndrew White2011-05-211-3/+7
| |
* | Merge pull request #1177 from joshk/ruby19_warningsJosé Valim2011-05-202-2/+0
|\ \ | | | | | | Fixed some ruby 19 warnings
| * | fixed some ruby 19 warnings, including circular requires and variable name reuseJosh Kalderimis2011-05-212-2/+0
| | |
* | | Temporarily ship with ContentLength middleware.José Valim2011-05-201-1/+1
| |/ |/|
* | Sprockets version update.Arun Agrawal2011-05-191-1/+1
| |
* | Merge pull request #1151 from joshk/wrap_params_options_changeJosé Valim2011-05-193-26/+26
|\ \ | | | | | | renamed the wrap_parameters :only and :except options to :include and :ex
| * | renamed the wrap_parameters :only and :except options to :include and ↵Josh Kalderimis2011-05-193-26/+26
| |/ | | | | | | :exclude to make it consistent with controller filters
* | adding teststeve2011-05-191-4/+8
| |
* | fixing sym and string cookie name, two cookies to browser bug.steve2011-05-191-3/+3
|/
* Example Usage updated for actionpack and actionmailer.Arun Agrawal2011-05-192-11/+11
|
* README updated for for => eachArun Agrawal2011-05-191-3/+3
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-181-1/+1
|\
| * fix coding error in readme reported in rails GH #980Vijay Dev2011-05-171-1/+1
| |
* | Update Rack::Mount to 0.8.1Prem Sichanugrist2011-05-181-1/+1
| |
* | Dump and load rack-cache stuff.José Valim2011-05-172-2/+27
| |
* | Merge pull request #247 from goncalossilva/performance_testJeremy Kemper2011-05-171-13/+6
|\ \ | | | | | | Performance tests improved
| * \ Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-05-08111-1590/+2738
| |\ \ | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/testing/performance.rb
| * \ \ Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-04-17118-3441/+1347
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-04-0310-32/+132
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-03-309-28/+127
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-03-2813-14/+191
| |\ \ \ \ \ \
| * | | | | | | remove deprecated documentationGonçalo Silva2011-03-281-3/+0
| | | | | | | |
| * | | | | | | move "check for ruby-prof" from AD/testing/performance_test to ↵Gonçalo Silva2011-03-241-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AS/testing/performance, where it is actually required
* | | | | | | | Bump sprockets dependencyJoshua Peek2011-05-171-1/+1
| | | | | | | |
* | | | | | | | Remove old call to sprockets contextJoshua Peek2011-05-171-9/+1
| | | | | | | |
* | | | | | | | Merge pull request #1093 from lucasmazza/patch-1José Valim2011-05-171-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Using the correct CSS compressor for the yui-compressor gem.
| * | | | | | | | Using the correct CSS compressor for the yui-compressor gem.Lucas Mazza2011-05-161-1/+1
| | | | | | | | |
* | | | | | | | | Use anonymous? that works on both Ruby 1.8 and 1.9.José Valim2011-05-172-5/+7
| | | | | | | | |
* | | | | | | | | add more robust test for wrapping params with anonymous classDavid Chelimsky2011-05-173-28/+51
| | | | | | | | |
* | | | | | | | | Add fix for error when an anonymous controller subclasses ApplicationControllerAndy Lindeman2011-05-171-1/+4
| | | | | | | | |
* | | | | | | | | better test nameDavid Chelimsky2011-05-171-1/+1
| | | | | | | | |
* | | | | | | | | add failing test for https://github.com/rails/rails/issues/1089David Chelimsky2011-05-171-0/+7
|/ / / / / / / /
* | | | | | | | Merge pull request #570 from sikachu/decouple_actionpackJosé Valim2011-05-153-14/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make ParamsWrapper use a well-defined API and not rely on AR methods
| * | | | | | | | Make ParamsWrapper calling newly introduced `Model.attribute_names` instead ↵Prem Sichanugrist2011-05-153-14/+12
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | of `.column_names`
* | | | | | | | Merge pull request #568 from carlosantoniodasilva/fields_for_fixesJosé Valim2011-05-152-36/+40
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fields for fixes for non nested attributes and without object
| * | | | | | | Use record_name to make fields for methods more consistentCarlos Antonio da Silva2011-05-141-6/+6
| | | | | | | |
| * | | | | | | Refactor fields_for to make the api more clear, and fix usage with non ↵Carlos Antonio da Silva2011-05-142-26/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nested attributes and without object
| * | | | | | | Cleanup instantiate builder method definitionCarlos Antonio da Silva2011-05-141-5/+2
| | | | | | | |
* | | | | | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-151-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Clean up redundant backslashesPirogov Evgenij2011-05-141-4/+4
| | | | | | | | |
* | | | | | | | | Do not try to call `column_names` on the abstract class.Prem Sichanugrist2011-05-152-2/+15
| |/ / / / / / / |/| | | | | | | | | | | | | | | Normally the table for abstract class won't be existed, so we should not trying to call `#column_names` on it.
* | | | | | | | Reset ActiveRecord::LogSubscriber runtime at the start of each requestTom Ward2011-05-141-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the runtime was reset implicitly when #cleanup_view_runtime was called at the end of most requests. However, this doesn't happen when the request redirects, or send_file is called. Consequently, the ActiveRecord runtime recorded in the logs included the time taken for both the current request and the previous redirect. Explicitly resetting at the start of each request ensures that this can't happen, no matter what occurs previously.
* | | | | | | | Escape regex in controller_runtime_test to actually check that the ↵Tom Ward2011-05-141-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | ActiveRecord message appears
* | | | | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-1416-128/+163
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/date_helper.rb railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
| * | | | | | | minor edits after going through what's new in docrailsXavier Noria2011-05-143-10/+13
| | | | | | | |
| * | | | | | | added an example for AC::UrlFor usage to make usage simpler.Nick Sutterer2011-05-121-1/+13
| | | | | | | |
| * | | | | | | added docs for AbC::UrlFor and AC::UrlFor.Nick Sutterer2011-05-122-0/+12
| | | | | | | |
| * | | | | | | Follow code conventions on docsSebastian Martinez2011-05-104-12/+12
| | | | | | | |