| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | Merge pull request #1241 from smartinez87/extra-space | Santiago Pastorino | 2011-05-23 | 7 | -8/+8 |
|\ \ |
|
| * | | Remove extra white-space on some exception messages. | Sebastian Martinez | 2011-05-23 | 7 | -8/+8 |
* | | | Move the last pockets of Sprockets stuff into the Sprockets directory | wycats | 2011-05-23 | 5 | -25/+16 |
* | | | Move javascript/css helpers into the Sprockets helper and just have them over... | wycats | 2011-05-23 | 3 | -55/+56 |
* | | | Start moving some logic from being embedded in AV into the Rails Sprockets ex... | wycats | 2011-05-23 | 5 | -62/+60 |
|/ / |
|
* | | fixing 1.8 support for new fixture tests | Aaron Patterson | 2011-05-23 | 3 | -4/+9 |
* | | removing CSV fixture support | Aaron Patterson | 2011-05-23 | 2 | -58/+10 |
* | | fixture file will validate fixture format | Aaron Patterson | 2011-05-23 | 2 | -1/+26 |
* | | return an empty array for empty yaml files | Aaron Patterson | 2011-05-23 | 2 | -1/+20 |
* | | use top level file constant for join, etc | Aaron Patterson | 2011-05-23 | 1 | -4/+4 |
* | | adding AR::Fixtures::File class to wrap a fixture file | Aaron Patterson | 2011-05-23 | 3 | -0/+90 |
|/ |
|
* | Removed ActiveSupport::SecureRandom in favour of SecureRandom from the standa... | Jon Leighton | 2011-05-23 | 7 | -29/+8 |
* | Replace references to ActiveSupport::SecureRandom with just SecureRandom, and... | Jon Leighton | 2011-05-23 | 13 | -20/+22 |
* | Merge pull request #1231 from joshk/ruby-debugger | José Valim | 2011-05-23 | 9 | -45/+47 |
|\ |
|
| * | Removed the AS core_ext/kernel/debugger breakpoint method as this method is a... | Josh Kalderimis | 2011-05-23 | 2 | -10/+44 |
| * | Removed AS core_ext/kernel/requires as it's not used and is bad practice. | Josh Kalderimis | 2011-05-23 | 7 | -35/+3 |
* | | Merge pull request #1230 from smartinez87/changelog | José Valim | 2011-05-23 | 1 | -0/+2 |
|\ \
| |/
|/| |
|
| * | Add entry to AP changelog | Sebastian Martinez | 2011-05-23 | 1 | -0/+2 |
|/ |
|
* | Merge pull request #1228 from fcheung/db_time_fix2 | José Valim | 2011-05-23 | 2 | -1/+29 |
|\ |
|
| * | Take into account time spent in AR even if a redirect occurs or if it is afte... | Frederick Cheung | 2011-05-23 | 2 | -1/+29 |
* | | Move content length to the server, this brings the same behavior as in rack 1.2. | José Valim | 2011-05-23 | 3 | -9/+7 |
* | | Require rubygems (chill out, just for rails internal tests). | José Valim | 2011-05-23 | 1 | -0/+1 |
* | | Merge pull request #1184 from gnufied/master | Aaron Patterson | 2011-05-23 | 1 | -0/+1 |
|\ \ |
|
| * | | fix connection not established error while running rake task | Bhavin Kamani | 2011-05-21 | 1 | -0/+1 |
* | | | Bump Rack version | wycats | 2011-05-22 | 1 | -1/+1 |
* | | | Eliminate uninitialized instance variable warning | wycats | 2011-05-22 | 1 | -2/+2 |
* | | | Prepare the context in URLHelperTest so that there are no required uninitiali... | wycats | 2011-05-22 | 1 | -0/+2 |
* | | | Merge pull request #1222 from arunagw/sprockets-fixes | José Valim | 2011-05-22 | 2 | -8/+0 |
|\ \ \ |
|
| * | | | We don't need to load version any more as Sprockets.beta8 is included. | Arun Agrawal | 2011-05-23 | 2 | -8/+0 |
* | | | | Always initialize @title in caching test to avoid uninitialized instance vari... | wycats | 2011-05-22 | 1 | -0/+3 |
* | | | | Restructure TemplateAssertions-related code to eliminate circular requires. | wycats | 2011-05-22 | 3 | -20/+13 |
* | | | | Make :status an attr_reader to avoid unnecessary warning when replacing status= | wycats | 2011-05-22 | 1 | -1/+2 |
|/ / / |
|
* | | | Merge branch '3-1-stable' | Joshua Peek | 2011-05-22 | 6 | -18/+61 |
|\ \ \ |
|
| * | | | Require sprockets beta 8 | Joshua Peek | 2011-05-22 | 1 | -1/+1 |
| * | | | Add debug_asset support | Joshua Peek | 2011-05-22 | 4 | -17/+58 |
| * | | | Lock to stable sprockets beta | Joshua Peek | 2011-05-22 | 1 | -1/+1 |
| * | | | Fix I18n dependency as final is out. | José Valim | 2011-05-22 | 2 | -2/+2 |
* | | | | Revert "Take into account time spent in AR even if a redirect occurs or if it... | David Heinemeier Hansson | 2011-05-22 | 2 | -31/+3 |
* | | | | Merge pull request #1221 from sikachu/fix_tests | David Heinemeier Hansson | 2011-05-22 | 2 | -2/+8 |
|\ \ \ \ |
|
| * | | | | Make sure that we're able to run Action Pack test standalone. | Prem Sichanugrist | 2011-05-22 | 2 | -2/+8 |
|/ / / / |
|
* | | | | Fix problem with loading polymorphic associations which have been defined in ... | Jon Leighton | 2011-05-22 | 5 | -15/+35 |
* | | | | Merge pull request #1219 from fcheung/db_time_fix | José Valim | 2011-05-22 | 2 | -3/+31 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Take into account time spent in AR even if a redirect occurs or if it is afte... | Frederick Cheung | 2011-05-22 | 2 | -3/+31 |
|/ / / |
|
* | | | Merge pull request #1215 from vatrai/remove_require_tzinfo | José Valim | 2011-05-22 | 1 | -3/+1 |
|\ \ \ |
|
| * | | | remove require active_support/tzinfo as file dosent exists #TODO fix | Vishnu Atrai | 2011-05-22 | 1 | -3/+1 |
* | | | | Merge pull request #1192 from arunagw/removal_extra | José Valim | 2011-05-22 | 3 | -9/+0 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Not loading ruby-debug specially. | Arun Agrawal | 2011-05-22 | 1 | -5/+0 |
| * | | | No more need rubygems here. | Arun Agrawal | 2011-05-22 | 3 | -4/+0 |
* | | | | Merge pull request #1202 from vatrai/todo_fix | José Valim | 2011-05-22 | 1 | -3/+3 |
|\ \ \ \ |
|
| * | | | | require 'time' | Vishnu Atrai | 2011-05-22 | 1 | -1/+2 |