Jon Leighton
c69111ba5f
Fix infinite recursion where a lazy default scope references a scope. Fixes #1264 .
2011-05-25 00:08:14 +01:00
wycats
d21fef324b
Hide css:* and the default stylesheet from rails g
2011-05-24 16:04:28 -07:00
wycats
c1df4425b6
Update generator config to support hiding namespaces and pass the app into generator blocks
2011-05-24 16:04:28 -07:00
tomhuda
74ade51eee
Move SCSS generators and default templates from Rails to the Sass Railtie (d435726312601edb3ba6f97b34f562221f72c1f8).
...
* Sass gem registers a compressor
* Sass gem registers generators for assets and scaffold
* Create a default stylesheet_engine ("css") for apps that remove the Sass gem
2011-05-24 16:04:28 -07:00
tomhuda
88cb89056b
Change compressor API so that plugins can register default compressors for their stylesheet or JS engines and still allow the user to turn off compression
2011-05-24 16:04:28 -07:00
José Valim
4b86e7bab0
Merge pull request #1283 from joshk/actiom_mailer_tests_fixed
...
corrected/fixed the ActionMailer tests
2011-05-24 16:01:25 -07:00
Josh Kalderimis
21317d8824
corrected the ActionMailer tests which broke due to some code removed from ActionPack
2011-05-25 00:57:50 +02:00
José Valim
6f413d87b2
Merge pull request #1281 from joshk/removed_action_pack_deprecations
...
removed deprecated methods, and related tests, from ActionPack
2011-05-24 15:40:08 -07:00
Jon Leighton
ce37f747cd
Merge pull request #1254 from pixeltrix/ignore-includes-in-through-scope
...
Ignore :includes on through associations
2011-05-24 15:34:28 -07:00
Jon Leighton
a000ff7a50
Ensure that the surrounding code in Relation#to_a respects the default_scope (as well as having Relation#arel respect the default scope). Fixes #1233 .
2011-05-24 23:29:44 +01:00
Andrew White
f1f1ab77df
Failing tests for #1233 .
2011-05-24 23:25:21 +01:00
Josh Kalderimis
d182b6ee9c
removed deprecated methods, and related tests, from ActionPack
2011-05-24 23:38:59 +02:00
José Valim
90f59b24dc
Merge pull request #1279 from dasch/patch-2
...
Use quotes consistently in Gemfile
2011-05-24 13:32:37 -07:00
José Valim
eff0fdfd60
Merge pull request #1279 from dasch/patch-2
...
Use quotes consistently in Gemfile
2011-05-24 13:29:48 -07:00
Daniel Schierbeck
ef8c2a89a5
Also use double quotes for #source
2011-05-24 13:29:29 -07:00
Daniel Schierbeck
962936c56b
Use quotes consistently in Gemfile
2011-05-24 13:27:43 -07:00
José Valim
b3f51e3b1c
Merge pull request #1239 from alindeman/master
...
Use set data structure to speed up circular reference checks on large/deeply nested objects
2011-05-24 12:59:06 -07:00
José Valim
806d6009f3
Merge pull request #1278 from vijaydev/rake-doctask-warning-fix
...
Fixes Rake::RDocTask deprecation warnings from Rake 0.9.0
2011-05-24 12:28:14 -07:00
Vijay Dev
b921679d0d
fixes Rake::RDocTask deprecation warnings from rake 0.9.0
2011-05-25 00:49:22 +05:30
José Valim
36991f195b
Merge pull request #1274 from vijaydev/rake-packagetask-warning-fix
...
Fixes for Rake::GemPackageTask deprecation warnings from Rake 0.9.0
2011-05-24 12:14:30 -07:00
Aaron Patterson
176883a906
rescue record invalid exceptions and return false from the save method. fixes #796
2011-05-24 11:22:11 -07:00
Aaron Patterson
559d809609
add tests surrounding behavior of save and save! for associations that have validation errors
2011-05-24 11:21:24 -07:00
Vijay Dev
79e9a2983a
fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0
2011-05-24 23:39:24 +05:30
Aaron Patterson
964338777d
adding a test for create! with invalid associations
2011-05-24 11:06:36 -07:00
Aaron Patterson
0df8830160
do not bother with assert_nothing_raised, the test will fail and we get a better trace without it
2011-05-24 11:05:36 -07:00
Joey Butler
e106dbf039
Add failing test case for issue 796
2011-05-24 10:59:37 -07:00
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 Workman
06436b2cad
Added a test to check for correct behaviour with no options in add_index command recorder
2011-05-24 17:06:40 +01:00
Karunakar (Ruby)
bfb9f758ae
changed http://api.rubyonrails.com to http://api.rubyonrails.org in readme files
2011-05-24 21:12:01 +05:30
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
Stefan Sprenger
e2a0a94c6e
Add test for shebang in engine's script/rails file
2011-05-24 13:57:36 +02: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
Stefan Sprenger
e366cd7f91
Merge branch 'master' of https://github.com/rails/rails
2011-05-24 12:43:55 +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
Stefan Sprenger
ab0d2f2d62
Remove shebang from the template since it's already added by the
...
generator
2011-05-24 12:34:05 +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