diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-24 01:33:18 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-24 01:33:18 +0530 |
| commit | efd0bd3b7390ebb8526b981169025f2860f6a113 (patch) | |
| tree | 1cb3bcd8f9534f64e8a764af1010ce65303b42b0 /railties/test/fixtures | |
| parent | f4571e3617ccd9cc9e5ee9f7431066bd80395e22 (diff) | |
| parent | 8ff2fb6f3aa6140f5a8bd018d5919a8a1e707cda (diff) | |
| download | rails-efd0bd3b7390ebb8526b981169025f2860f6a113.tar.gz rails-efd0bd3b7390ebb8526b981169025f2860f6a113.tar.bz2 rails-efd0bd3b7390ebb8526b981169025f2860f6a113.zip | |
Merge remote branch 'mainstream/master'
Diffstat (limited to 'railties/test/fixtures')
| -rw-r--r-- | railties/test/fixtures/lib/generators/model_generator.rb | 1 | ||||
| -rw-r--r-- | railties/test/fixtures/lib/rails_generators/foobar/foobar_generator.rb (renamed from railties/test/fixtures/lib/generators/foobar/foobar_generator.rb) | 0 |
2 files changed, 1 insertions, 0 deletions
diff --git a/railties/test/fixtures/lib/generators/model_generator.rb b/railties/test/fixtures/lib/generators/model_generator.rb new file mode 100644 index 0000000000..9098a8a354 --- /dev/null +++ b/railties/test/fixtures/lib/generators/model_generator.rb @@ -0,0 +1 @@ +raise "I should never be loaded"
\ No newline at end of file diff --git a/railties/test/fixtures/lib/generators/foobar/foobar_generator.rb b/railties/test/fixtures/lib/rails_generators/foobar/foobar_generator.rb index d1de8c56fa..d1de8c56fa 100644 --- a/railties/test/fixtures/lib/generators/foobar/foobar_generator.rb +++ b/railties/test/fixtures/lib/rails_generators/foobar/foobar_generator.rb |