aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Move javascript/css helpers into the Sprockets helper and just have them over...wycats2011-05-233-55/+56
* | | | Start moving some logic from being embedded in AV into the Rails Sprockets ex...wycats2011-05-235-62/+60
|/ / /
* | | Replace references to ActiveSupport::SecureRandom with just SecureRandom, and...Jon Leighton2011-05-236-8/+8
* | | Add entry to AP changelogSebastian Martinez2011-05-231-0/+2
* | | Merge pull request #1228 from fcheung/db_time_fix2José Valim2011-05-231-0/+26
|\ \ \
| * | | Take into account time spent in AR even if a redirect occurs or if it is afte...Frederick Cheung2011-05-231-0/+26
* | | | Bump Rack versionwycats2011-05-221-1/+1
* | | | Eliminate uninitialized instance variable warningwycats2011-05-221-2/+2
* | | | Prepare the context in URLHelperTest so that there are no required uninitiali...wycats2011-05-221-0/+2
* | | | Merge pull request #1222 from arunagw/sprockets-fixesJosé Valim2011-05-222-8/+0
|\ \ \ \
| * | | | We don't need to load version any more as Sprockets.beta8 is included. Arun Agrawal2011-05-232-8/+0
* | | | | Always initialize @title in caching test to avoid uninitialized instance vari...wycats2011-05-221-0/+3
* | | | | Restructure TemplateAssertions-related code to eliminate circular requires.wycats2011-05-223-20/+13
* | | | | 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-225-18/+60
|\ \ \ \
| * | | | Require sprockets beta 8Joshua Peek2011-05-221-1/+1
| * | | | Add debug_asset supportJoshua Peek2011-05-224-17/+58
| * | | | Lock to stable sprockets betaJoshua Peek2011-05-221-1/+1
| * | | | Fix I18n dependency as final is out.José Valim2011-05-221-1/+1
| | |_|/ | |/| |
* | | | Revert "Take into account time spent in AR even if a redirect occurs or if it...David Heinemeier Hansson2011-05-221-26/+0
* | | | Make sure that we're able to run Action Pack test standalone.Prem Sichanugrist2011-05-222-2/+8
* | | | Take into account time spent in AR even if a redirect occurs or if it is afte...Frederick Cheung2011-05-221-0/+26
| |/ / |/| |
* | | Move I18n dependency back to ActiveSupport.José Valim2011-05-221-1/+0
* | | 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-222-0/+144
|\ \ \ | |/ / |/| |
| * | Add method fields_for_with_index to FormHelperJorge Bejar2011-05-212-0/+144
* | | Bump versions for rc1David Heinemeier Hansson2011-05-211-1/+1
* | | Merge pull request #1165 from arunagw/rubyforge_removeJosé Valim2011-05-211-1/+0
|\ \ \
| * | | Not updating rubyforge for new versions. Result of "gem list -d rails" is not...Arun Agrawal2011-05-201-1/+0
| |/ /
* | | 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, 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 :exclud...Josh Kalderimis2011-05-193-26/+26
| |/ /
* | | 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
|\ \
| * \ Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-05-08111-1590/+2738
| |\ \
| * \ \ 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
| |\ \ \ \ \ \