Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | adding a test for create! with invalid associations | Aaron Patterson | 2011-05-24 | 1 | -0/+9 | |
| | | | | | | | ||||||
* | | | | | | | do not bother with assert_nothing_raised, the test will fail and we get a ↵ | Aaron Patterson | 2011-05-24 | 1 | -3/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | better trace without it | |||||
* | | | | | | | Add failing test case for issue 796 | Joey Butler | 2011-05-24 | 1 | -0/+9 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #1271 from joshk/remove_am_deprecated_methods | José Valim | 2011-05-24 | 10 | -1667/+6 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Removed deprecated ActionMailer API and related tests | |||||
| * | | | | | | Removed deprecated ActionMailer API and related tests | Josh Kalderimis | 2011-05-24 | 10 | -1667/+6 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #1247 from arunagw/loading-file | Aaron Patterson | 2011-05-24 | 1 | -83/+82 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Not loading file if PLATFORM not available. | |||||
| * | | | | | | | Not loading file if PLATFORM not available. | Arun Agrawal | 2011-05-24 | 1 | -83/+82 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #1253 from arunagw/preformance_java_import | Aaron Patterson | 2011-05-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | import to java_import. | |||||
| * | | | | | | | | import to java_import. | Arun Agrawal | 2011-05-24 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #1251 from arunagw/java_import | Aaron Patterson | 2011-05-24 | 1 | -6/+6 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Using java_import instead of import. Need to do this with rake 0.9.0 #jruby | |||||
| * | | | | | | | | Using java_import instead of import. Need to do this with rake 0.9.0 #jruby | Arun Agrawal | 2011-05-24 | 1 | -6/+6 | |
| |/ / / / / / / | ||||||
* | / / / / / / | Remove asserts for js ext stuff thats not used any more | David Heinemeier Hansson | 2011-05-24 | 1 | -3/+0 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #1268 from ernie/compute_asset_host_fix | José Valim | 2011-05-24 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Redundant condition in compute_asset_host is redundant. | |||||
| * | | | | | | | Redundant condition in compute_asset_host is redundant. | Ernie Miller | 2011-05-24 | 1 | -3/+3 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #1267 from guilleiguaran/prefer-each-syntax | José Valim | 2011-05-24 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Prefer 'each' syntax instead of 'for in' | |||||
| * | | | | | | | Prefer each instead of for on activesupport | Guillermo Iguaran | 2011-05-24 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Prefer each instead of for in activeresource | Guillermo Iguaran | 2011-05-23 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
* | | | | | | | The asset pipeline is always on for new apps, dont need the legacy js ext stuff | David Heinemeier Hansson | 2011-05-24 | 1 | -11/+0 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #1257 from dmathieu/yml_alias | David Heinemeier Hansson | 2011-05-24 | 3 | -4/+4 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Properly reference yml alias nodes | |||||
| * | | | | | | | 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 |