diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2015-06-01 13:35:31 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2015-06-01 13:35:31 -0300 |
| commit | 651fa5edcdfbd43281209f19a329d6962e711263 (patch) | |
| tree | 98da7e3e92bca523f5d059a9cdfc929262794890 | |
| parent | a4cf371e11ca738255ddd13d191fd22931260070 (diff) | |
| parent | 757dd93c7fb59965fcb19581281f2f4eec7a7222 (diff) | |
| download | rails-651fa5edcdfbd43281209f19a329d6962e711263.tar.gz rails-651fa5edcdfbd43281209f19a329d6962e711263.tar.bz2 rails-651fa5edcdfbd43281209f19a329d6962e711263.zip | |
Merge pull request #20406 from yoongkang/add_edge_sprockets
Use sprockets-rails from github repo
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 061fafb156..c02b39d203 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -208,11 +208,13 @@ module Rails if options.dev? [ GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH), + GemfileEntry.github('sprockets-rails', 'rails/sprockets-rails'), GemfileEntry.github('arel', 'rails/arel') ] elsif options.edge? [ GemfileEntry.github('rails', 'rails/rails'), + GemfileEntry.github('sprockets-rails', 'rails/sprockets-rails'), GemfileEntry.github('arel', 'rails/arel') ] else |