aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Addresses an inconsistency in the ActiveRecord::Base.method_missing handling ↵Jeremy Friesen2011-05-243-1/+11
| | | | of dynamic finder methods and the passing of the &block parameter for :find_by_attributes.
* Merge pull request #1247 from arunagw/loading-fileAaron Patterson2011-05-241-83/+82
|\ | | | | Not loading file if PLATFORM not available.
| * Not loading file if PLATFORM not available. Arun Agrawal2011-05-241-83/+82
| |
* | Merge pull request #1253 from arunagw/preformance_java_importAaron Patterson2011-05-241-1/+1
|\ \ | | | | | | import to java_import.
| * | import to java_import. Arun Agrawal2011-05-241-1/+1
| |/
* | Merge pull request #1251 from arunagw/java_importAaron Patterson2011-05-241-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 #jrubyArun Agrawal2011-05-241-6/+6
| |/
* | Remove asserts for js ext stuff thats not used any moreDavid Heinemeier Hansson2011-05-241-3/+0
| |
* | Merge pull request #1268 from ernie/compute_asset_host_fixJosé Valim2011-05-241-3/+3
|\ \ | | | | | | Redundant condition in compute_asset_host is redundant.
| * | Redundant condition in compute_asset_host is redundant.Ernie Miller2011-05-241-3/+3
| | |
* | | Merge pull request #1267 from guilleiguaran/prefer-each-syntaxJosé Valim2011-05-242-2/+2
|\ \ \ | |/ / |/| | Prefer 'each' syntax instead of 'for in'
| * | Prefer each instead of for on activesupportGuillermo Iguaran2011-05-241-1/+1
| | |
| * | Prefer each instead of for in activeresourceGuillermo Iguaran2011-05-231-1/+1
| |/
* | The asset pipeline is always on for new apps, dont need the legacy js ext stuffDavid Heinemeier Hansson2011-05-241-11/+0
| |
* | Merge pull request #1257 from dmathieu/yml_aliasDavid Heinemeier Hansson2011-05-243-4/+4
|\ \ | | | | | | Properly reference yml alias nodes
| * | properly reference yml alias nodesdmathieu2011-05-243-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_testsJosé Valim2011-05-242-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_pathdmathieu2011-05-242-1/+8
|/ / /
* / / Fix failing test suite (please run tests before sending pull requests :S)José Valim2011-05-241-1/+2
|/ /
* | Remaining cleanup from changes to AssetTagHelpertomhuda2011-05-244-12/+9
| |
* | Merge pull request #1255 from flippingbits/masterJosé Valim2011-05-242-1/+7
|\ \ | | | | | | Fix gemspec of full or mountable engines
| * | Add test for gemspec of the generated engineStefan Sprenger2011-05-241-0/+6
| | |
| * | Add folders app and config to the engine's gemspec if they're availableStefan Sprenger2011-05-241-1/+1
|/ /
* | Merge pull request #1243 from smartinez87/warningsJosé Valim2011-05-233-13/+13
|\ \ | |/ |/| Fix 'warning: ambiguous first argument; put parentheses or even spaces'.
| * Parenthesize arguments when the first one is a Regexp literal.Sebastian Martinez2011-05-233-13/+13
| | | | | | | | This fixes 'warning: ambiguous first argument; put parentheses or even spaces'.
* | 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 exception message.
| * 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 ↵wycats2011-05-233-55/+56
| | | | | | | | override the old behavior
* | Start moving some logic from being embedded in AV into the Rails Sprockets ↵wycats2011-05-235-62/+60
|/ | | | extensions
* 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 ↵Jon Leighton2011-05-237-29/+8
| | | | standard library. (It has been deprecated in the 3-1-stable branch.)
* Replace references to ActiveSupport::SecureRandom with just SecureRandom, ↵Jon Leighton2011-05-2313-20/+22
| | | | and require 'securerandom' from the stdlib when active support is required.
* Merge pull request #1231 from joshk/ruby-debuggerJosé Valim2011-05-239-45/+47
|\ | | | | Ruby debugger corrections
| * Removed the AS core_ext/kernel/debugger breakpoint method as this method is ↵Josh Kalderimis2011-05-232-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 Kalderimis2011-05-237-35/+3
| |
* | Merge pull request #1230 from smartinez87/changelogJosé Valim2011-05-231-0/+2
|\ \ | |/ |/| Add entry to AP changelog
| * 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 after the render
| * Take into account time spent in AR even if a redirect occurs or if it is ↵Frederick Cheung2011-05-232-1/+29
| | | | | | | | after the render
* | 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
|\ \ | | | | | | Fixes connection_not established error while running db:schema:dump
| * | fix connection not established error while running rake taskBhavin Kamani2011-05-211-0/+1
| | | | | | | | | | | | db:schema:dump