aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* Replace references to ActiveSupport::SecureRandom with just SecureRandom, ↵Jon Leighton2011-05-234-4/+4
| | | | and require 'securerandom' from the stdlib when active support is required.
* Restructure TemplateAssertions-related code to eliminate circular requires.wycats2011-05-223-20/+13
| | | Also, no need to include dependencies in AS::Concerns inside included blocks.
* Make :status an attr_reader to avoid unnecessary warning when replacing status=wycats2011-05-221-1/+2
|
* Merge branch '3-1-stable'Joshua Peek2011-05-221-15/+47
|\ | | | | | | | | | | Conflicts: actionpack/actionpack.gemspec activemodel/activemodel.gemspec
| * Add debug_asset supportJoshua Peek2011-05-221-15/+47
| |
* | Edited actionpack/lib/action_view/helpers/form_helper.rb via GitHubJosé Valim2011-05-221-0/+1
| |
* | Merge pull request #1189 from jmbejar/7c562d5e460d97b18e4f3367b3cfb13401732920José Valim2011-05-221-0/+19
|\ \ | |/ |/| Add method FormHelper#fields_for_with_index
| * Add method fields_for_with_index to FormHelperJorge Bejar2011-05-211-0/+19
| |
* | Bump versions for rc1David Heinemeier Hansson2011-05-211-1/+1
| |
* | 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
| |
* | Merge pull request #1151 from joshk/wrap_params_options_changeJosé Valim2011-05-191-17/+17
|\ \ | | | | | | 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-191-17/+17
| |/ | | | | | | :exclude to make it consistent with controller filters
* / 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-191-2/+2
|
* Dump and load rack-cache stuff.José Valim2011-05-171-2/+6
|
* 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-0875-1235/+1864
| |\ | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/testing/performance.rb
| * \ Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-04-1755-1759/+775
| |\ \
| * \ \ Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-04-035-30/+68
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-03-304-24/+32
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-03-288-12/+64
| |\ \ \ \ \
| * | | | | | 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
* | | | | | | 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-172-3/+6
| | | | | | | |
* | | | | | | | Add fix for error when an anonymous controller subclasses ApplicationControllerAndy Lindeman2011-05-171-1/+4
|/ / / / / / /
* | | | | | | Merge pull request #570 from sikachu/decouple_actionpackJosé Valim2011-05-151-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | 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-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of `.column_names`
* | | | | | | | Merge pull request #568 from carlosantoniodasilva/fields_for_fixesJosé Valim2011-05-151-36/+26
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | 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-141-26/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-151-1/+1
|/ / / / / / / | | | | | | | | | | | | | | Normally the table for abstract class won't be existed, so we should not trying to call `#column_names` on it.
* | | | | | | 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
| | | | | | | |
| * | | | | | | Fix styiling issues on DateHelper docsSebastian Martinez2011-05-101-64/+70
| | | | | | | |
| * | | | | | | Fix styiling issues on AtomFeedHelper docsSebastian Martinez2011-05-101-4/+4
| | | | | | | |
| * | | | | | | Remove extra whitespace.Sebastian Martinez2011-05-101-1/+1
| | | | | | | |
| * | | | | | | Fix styiling issue on TranslationHelper docsSebastian Martinez2011-05-101-4/+4
| | | | | | | |
| * | | | | | | Fix styiling issue on ActionView::Template docsSebastian Martinez2011-05-101-5/+5
| | | | | | | |