Commit Graph

22864 Commits

Author SHA1 Message Date
Vijay Dev
79e9a2983a fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0 2011-05-24 23:39:24 +05:30
José Valim
c4a9467af4 Merge pull request #1271 from joshk/remove_am_deprecated_methods
Removed deprecated ActionMailer API and related tests
2011-05-24 10:35:46 -07:00
Josh Kalderimis
d500ad3f05 Removed deprecated ActionMailer API and related tests 2011-05-24 18:52:11 +02:00
Aaron Patterson
ae323a51f1 Merge pull request #1247 from arunagw/loading-file
Not loading file if PLATFORM not available.
2011-05-24 09:08:38 -07:00
Aaron Patterson
4d3c30adb9 Merge pull request #1253 from arunagw/preformance_java_import
import to java_import.
2011-05-24 09:07:32 -07:00
Aaron Patterson
68d5abeaff Merge pull request #1251 from arunagw/java_import
Using java_import instead of import. Need to do this with rake 0.9.0 #jruby
2011-05-24 09:06:44 -07:00
David Heinemeier Hansson
dea4035082 Remove asserts for js ext stuff thats not used any more 2011-05-24 10:22:06 -05:00
José Valim
b865576873 Merge pull request #1268 from ernie/compute_asset_host_fix
Redundant condition in compute_asset_host is redundant.
2011-05-24 08:15:25 -07:00
Ernie Miller
15baa49871 Redundant condition in compute_asset_host is redundant. 2011-05-24 11:09:59 -04:00
José Valim
408bbdcda1 Merge pull request #1267 from guilleiguaran/prefer-each-syntax
Prefer 'each' syntax instead of 'for in'
2011-05-24 08:07:49 -07:00
David Heinemeier Hansson
67e12eb378 The asset pipeline is always on for new apps, dont need the legacy js ext stuff 2011-05-24 07:45:54 -05:00
David Heinemeier Hansson
dac68cb922 Merge pull request #1257 from dmathieu/yml_alias
Properly reference yml alias nodes
2011-05-24 05:40:05 -07:00
José Valim
cedadad891 Merge pull request #1262 from dmathieu/dummy_without_tests
Create the dummy app if there's no test_unit but there's a dummy_path
2011-05-24 04:59:28 -07:00
dmathieu
3d9d9f86f5 create the dummy app if there's no test_unit but there's a dummy_path 2011-05-24 13:18:27 +02:00
José Valim
b8118ef492 Fix failing test suite (please run tests before sending pull requests :S) 2011-05-24 12:37:57 +02:00
dmathieu
79dc275b8d properly reference yml alias nodes
as per the last version of the yml specifications : http://www.yaml.org/spec/1.2/spec.html#* alias//
2011-05-24 11:18:28 +02:00
tomhuda
00be5bd75d Remaining cleanup from changes to AssetTagHelper 2011-05-24 00:39:04 -07:00
José Valim
72c7160d0d Merge pull request #1255 from flippingbits/master
Fix gemspec of full or mountable engines
2011-05-24 00:37:57 -07:00
Stefan Sprenger
855d14dd94 Add test for gemspec of the generated engine 2011-05-24 09:30:23 +02:00
Stefan Sprenger
e3d7751b54 Add folders app and config to the engine's gemspec if they're available 2011-05-24 09:06:48 +02:00
Guillermo Iguaran
f4d100bb5a Prefer each instead of for on activesupport 2011-05-24 00:41:41 -05:00
José Valim
a47a65f105 Merge pull request #1243 from smartinez87/warnings
Fix 'warning: ambiguous first argument; put parentheses or even spaces'.
2011-05-23 22:32:15 -07:00
Arun Agrawal
ed4f2b9862 import to java_import. 2011-05-24 10:13:27 +05:30
Arun Agrawal
89da0d3ab9 Using java_import instead of import. Need to do this with rake 0.9.0 #jruby 2011-05-24 10:07:05 +05:30
Guillermo Iguaran
647c55ac43 Prefer each instead of for in activeresource 2011-05-23 23:08:48 -05:00
Arun Agrawal
f75df05fd1 Not loading file if PLATFORM not available. 2011-05-24 09:16:50 +05:30
Sebastian Martinez
130c9b71aa Parenthesize arguments when the first one is a Regexp literal.
This fixes 'warning: ambiguous first argument; put parentheses or even spaces'.
2011-05-23 21:45:00 -03:00
wycats
9dabbd0cff Make sure that Sprockets::Helpers::RailsHelper can be found 2011-05-23 17:27:57 -07:00
Santiago Pastorino
8e7590c72c Merge pull request #1241 from smartinez87/extra-space
Remove extra white-space on exception message.
2011-05-23 17:09:35 -07:00
Sebastian Martinez
05f29ca2c9 Remove extra white-space on some exception messages. 2011-05-23 20:53:18 -03:00
wycats
a9f22dc272 Move the last pockets of Sprockets stuff into the Sprockets directory 2011-05-23 16:45:26 -07:00
wycats
76f947edf7 Move javascript/css helpers into the Sprockets helper and just have them override the old behavior 2011-05-23 16:45:26 -07:00
wycats
4b79029490 Start moving some logic from being embedded in AV into the Rails Sprockets extensions 2011-05-23 16:45:26 -07:00
Aaron Patterson
5ec23b95ba fixing 1.8 support for new fixture tests 2011-05-23 15:06:13 -07:00
Aaron Patterson
1716da0720 removing CSV fixture support 2011-05-23 15:06:12 -07:00
Aaron Patterson
081b36c6ce fixture file will validate fixture format 2011-05-23 15:06:12 -07:00
Aaron Patterson
5278af3d8e return an empty array for empty yaml files 2011-05-23 15:06:12 -07:00
Aaron Patterson
74c5f65bfb use top level file constant for join, etc 2011-05-23 15:06:12 -07:00
Aaron Patterson
ad3f0eec75 adding AR::Fixtures::File class to wrap a fixture file 2011-05-23 15:06:12 -07:00
Jon Leighton
1170cceaae Removed ActiveSupport::SecureRandom in favour of SecureRandom from the standard library. (It has been deprecated in the 3-1-stable branch.) 2011-05-23 20:25:44 +01:00
Jon Leighton
d411c85a65 Replace references to ActiveSupport::SecureRandom with just SecureRandom, and require 'securerandom' from the stdlib when active support is required. 2011-05-23 20:25:44 +01:00
José Valim
a5fb1c6175 Merge pull request #1231 from joshk/ruby-debugger
Ruby debugger corrections
2011-05-23 06:48:05 -07:00
José Valim
5c3f3f10ba Merge pull request #1230 from smartinez87/changelog
Add entry to AP changelog
2011-05-23 06:46:32 -07:00
Josh Kalderimis
2514d65ca2 Removed the AS core_ext/kernel/debugger breakpoint method as this method is added by ruby-debug and should be left as is. Missing tests added. 2011-05-23 15:44:48 +02:00
Josh Kalderimis
eff5d9aed4 Removed AS core_ext/kernel/requires as it's not used and is bad practice. 2011-05-23 15:31:33 +02:00
Sebastian Martinez
b4951b53ff Add entry to AP changelog 2011-05-23 10:03:52 -03:00
José Valim
a8b2a895b7 Merge pull request #1228 from fcheung/db_time_fix2
Take into account time spent in AR even if a redirect occurs or if it is after the render
2011-05-23 03:11:15 -07:00
Frederick Cheung
8a722e0912 Take into account time spent in AR even if a redirect occurs or if it is after the render 2011-05-23 10:58:43 +01:00
José Valim
6e5eedeb12 Move content length to the server, this brings the same behavior as in rack 1.2. 2011-05-23 10:28:00 +02:00
José Valim
c944cab6ce Require rubygems (chill out, just for rails internal tests). 2011-05-23 10:28:00 +02:00