| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | | properly reference yml alias nodes | dmathieu | 2011-05-24 | 3 | -4/+4 | |
| | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | as per the last version of the yml specifications : http://www.yaml.org/spec/1.2/spec.html#* alias// | |||||
| * | | | | | | | | | Merge pull request #1262 from dmathieu/dummy_without_tests | José Valim | 2011-05-24 | 2 | -1/+8 | |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | Create the dummy app if there's no test_unit but there's a dummy_path | |||||
| | * | | | | | | | | create the dummy app if there's no test_unit but there's a dummy_path | dmathieu | 2011-05-24 | 2 | -1/+8 | |
| |/ / / / / / / / | ||||||
| * / / / / / / / | Fix failing test suite (please run tests before sending pull requests :S) | José Valim | 2011-05-24 | 1 | -1/+2 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Remaining cleanup from changes to AssetTagHelper | tomhuda | 2011-05-24 | 4 | -12/+9 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #1255 from flippingbits/master | José Valim | 2011-05-24 | 2 | -1/+7 | |
| |\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Fix gemspec of full or mountable engines | |||||
| | * | | | | | | Add test for gemspec of the generated engine | Stefan Sprenger | 2011-05-24 | 1 | -0/+6 | |
| | | | | | | | | ||||||
| | * | | | | | | Add folders app and config to the engine's gemspec if they're available | Stefan Sprenger | 2011-05-24 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #1243 from smartinez87/warnings | José Valim | 2011-05-23 | 3 | -13/+13 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix 'warning: ambiguous first argument; put parentheses or even spaces'. | |||||
| | * | | | | | Parenthesize arguments when the first one is a Regexp literal. | Sebastian Martinez | 2011-05-23 | 3 | -13/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This fixes 'warning: ambiguous first argument; put parentheses or even spaces'. | |||||
| * | | | | | | Make sure that Sprockets::Helpers::RailsHelper can be found | wycats | 2011-05-23 | 2 | -1/+8 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #1241 from smartinez87/extra-space | Santiago Pastorino | 2011-05-23 | 7 | -8/+8 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Remove extra white-space on exception message. | |||||
| | * | | | | | 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 ↵ | wycats | 2011-05-23 | 3 | -55/+56 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | override the old behavior | |||||
| * | | | | | | Start moving some logic from being embedded in AV into the Rails Sprockets ↵ | wycats | 2011-05-23 | 5 | -62/+60 | |
| |/ / / / / | | | | | | | | | | | | | | | | extensions | |||||
| * | | | | | 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 ↵ | Jon Leighton | 2011-05-23 | 7 | -29/+8 | |
| | | | | | | | | | | | | | | | | | standard library. (It has been deprecated in the 3-1-stable branch.) | |||||
| * | | | | Replace references to ActiveSupport::SecureRandom with just SecureRandom, ↵ | Jon Leighton | 2011-05-23 | 13 | -20/+22 | |
| | | | | | | | | | | | | | | | | | and require 'securerandom' from the stdlib when active support is required. | |||||
| * | | | | Merge pull request #1231 from joshk/ruby-debugger | José Valim | 2011-05-23 | 9 | -45/+47 | |
| |\ \ \ \ | | | | | | | | | | | Ruby debugger corrections | |||||
| | * | | | | Removed the AS core_ext/kernel/debugger breakpoint method as this method is ↵ | Josh Kalderimis | 2011-05-23 | 2 | -10/+44 | |
| | | | | | | | | | | | | | | | | | | | | | added by ruby-debug and should be left as is. Missing tests added. | |||||
| | * | | | | 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 | |||||
| | * | | | 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 after the render | |||||
| | * | | | Take into account time spent in AR even if a redirect occurs or if it is ↵ | Frederick Cheung | 2011-05-23 | 2 | -1/+29 | |
| | | | | | | | | | | | | | | | | | after the render | |||||
| * | | | | 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 | |
| |\ \ \ \ | | | | | | | | | | | Fixes connection_not established error while running db:schema:dump | |||||
| | * | | | | fix connection not established error while running rake task | Bhavin Kamani | 2011-05-21 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | db:schema:dump | |||||
| * | | | | | 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 ↵ | wycats | 2011-05-22 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | uninitialized instance variables | |||||
| * | | | | | 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. | |||||
| | * | | | | | 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 ↵ | wycats | 2011-05-22 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | variable warning | |||||
| * | | | | | | Restructure TemplateAssertions-related code to eliminate circular requires. | wycats | 2011-05-22 | 3 | -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= | wycats | 2011-05-22 | 1 | -1/+2 | |
| |/ / / / / | ||||||
| * | | | | | Merge branch '3-1-stable' | Joshua Peek | 2011-05-22 | 6 | -18/+61 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/actionpack.gemspec activemodel/activemodel.gemspec | |||||
| | * | | | | | 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 ↵ | David Heinemeier Hansson | 2011-05-22 | 2 | -31/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is after the render" because it's causing test failures about missing db_during_render. This reverts commit 60b55baca9e381deb3a0a85580f089f4caf551d4. | |||||
| * | | | | | | 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. | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |