aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Simple fix for correctly inverting an add_index migration when a name has bee...David Workman2011-05-232-2/+12
* Merge pull request #1228 from fcheung/db_time_fix2José Valim2011-05-232-1/+29
|\
| * Take into account time spent in AR even if a redirect occurs or if it is afte...Frederick Cheung2011-05-232-1/+29
* | Move content length to the server, this brings the same behavior as in rack 1.2.José Valim2011-05-233-9/+7
* | Require rubygems (chill out, just for rails internal tests).José Valim2011-05-231-0/+1
* | Merge pull request #1184 from gnufied/masterAaron Patterson2011-05-231-0/+1
|\ \
| * | fix connection not established error while running rake taskBhavin Kamani2011-05-211-0/+1
* | | 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-226-18/+61
|\ \ \
| * | | 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-222-2/+2
* | | | Revert "Take into account time spent in AR even if a redirect occurs or if it...David Heinemeier Hansson2011-05-222-31/+3
* | | | Merge pull request #1221 from sikachu/fix_testsDavid Heinemeier Hansson2011-05-222-2/+8
|\ \ \ \
| * | | | Make sure that we're able to run Action Pack test standalone.Prem Sichanugrist2011-05-222-2/+8
|/ / / /
* | | | Fix problem with loading polymorphic associations which have been defined in ...Jon Leighton2011-05-225-15/+35
* | | | Merge pull request #1219 from fcheung/db_time_fixJosé Valim2011-05-222-3/+31
|\ \ \ \ | |_|_|/ |/| | |
| * | | Take into account time spent in AR even if a redirect occurs or if it is afte...Frederick Cheung2011-05-222-3/+31
|/ / /
* | | Merge pull request #1215 from vatrai/remove_require_tzinfoJosé Valim2011-05-221-3/+1
|\ \ \
| * | | remove require active_support/tzinfo as file dosent exists #TODO fixVishnu Atrai2011-05-221-3/+1
* | | | Merge pull request #1192 from arunagw/removal_extraJosé Valim2011-05-223-9/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Not loading ruby-debug specially. Arun Agrawal2011-05-221-5/+0
| * | | No more need rubygems here.Arun Agrawal2011-05-223-4/+0
* | | | Merge pull request #1202 from vatrai/todo_fixJosé Valim2011-05-221-3/+3
|\ \ \ \
| * | | | require 'time' Vishnu Atrai2011-05-221-1/+2
| * | | | Fix todo Time.xmlschema used instead of Time.parseVishnu Atrai2011-05-221-3/+2
* | | | | Merge pull request #1193 from arunagw/railties_testsJosé Valim2011-05-221-1/+0
|\ \ \ \ \
| * | | | | Loading action_controller twice removed.Arun Agrawal2011-05-221-1/+0
| | |/ / / | |/| | |
* | | | | Depend on I18n ~> 0.6José Valim2011-05-221-1/+1
* | | | | Move I18n dependency back to ActiveSupport.José Valim2011-05-224-6/+5
* | | | | 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
* | | | | Fix failing tests.José Valim2011-05-222-1/+4
* | | | | Merge pull request #1208 from dasch/patch-1José Valim2011-05-221-1/+1
|\ \ \ \ \
| * | | | | Remove superfluous whitespace from ActiveModel::SecurePassword Daniel Schierbeck2011-05-221-1/+1
|/ / / / /
* | | | | Merge pull request #1206 from arunagw/jruby_openssl_loadJosé Valim2011-05-222-2/+4
|\ \ \ \ \
| * | | | | Let's load jruby-openssl now for all. #jrubyArun Agrawal2011-05-222-2/+4
| | |_|/ / | |/| | |
* | | | | Merge pull request #1199 from vatrai/jdon_engine_test_fixJosé Valim2011-05-221-0/+1
|\ \ \ \ \
| * | | | | test fix jdom_engine_test Vishnu Atrai2011-05-221-0/+1
| |/ / / /
* | | | | Merge pull request #1198 from guilleiguaran/changelog_pluralize_table_namesJosé Valim2011-05-221-0/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Adding pluralize_table_names change to CHANGELOGGuillermo Iguaran2011-05-211-0/+8
|/ / / /