aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #1243 from smartinez87/warningsJosé Valim2011-05-233-13/+13
|\ \ \ | |/ / |/| |
| * | Parenthesize arguments when the first one is a Regexp literal.Sebastian Martinez2011-05-233-13/+13
* | | Make sure that Sprockets::Helpers::RailsHelper can be foundwycats2011-05-232-1/+8
|/ /
* | Merge pull request #1241 from smartinez87/extra-spaceSantiago Pastorino2011-05-237-8/+8
|\ \
| * | Remove extra white-space on some exception messages.Sebastian Martinez2011-05-237-8/+8
* | | Move the last pockets of Sprockets stuff into the Sprockets directorywycats2011-05-235-25/+16
* | | 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
|/ /
* | fixing 1.8 support for new fixture testsAaron Patterson2011-05-233-4/+9
* | removing CSV fixture supportAaron Patterson2011-05-232-58/+10
* | fixture file will validate fixture formatAaron Patterson2011-05-232-1/+26
* | return an empty array for empty yaml filesAaron Patterson2011-05-232-1/+20
* | use top level file constant for join, etcAaron Patterson2011-05-231-4/+4
* | adding AR::Fixtures::File class to wrap a fixture fileAaron Patterson2011-05-233-0/+90
|/
* Removed ActiveSupport::SecureRandom in favour of SecureRandom from the standa...Jon Leighton2011-05-237-29/+8
* Replace references to ActiveSupport::SecureRandom with just SecureRandom, and...Jon Leighton2011-05-2313-20/+22
* Merge pull request #1231 from joshk/ruby-debuggerJosé Valim2011-05-239-45/+47
|\
| * Removed the AS core_ext/kernel/debugger breakpoint method as this method is a...Josh Kalderimis2011-05-232-10/+44
| * Removed AS core_ext/kernel/requires as it's not used and is bad practice.Josh Kalderimis2011-05-237-35/+3
* | Merge pull request #1230 from smartinez87/changelogJosé Valim2011-05-231-0/+2
|\ \ | |/ |/|
| * Add entry to AP changelogSebastian Martinez2011-05-231-0/+2
|/
* 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