diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-12-16 16:57:11 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-12-16 16:57:11 -0200 |
| commit | b1c19eb05299fbae2a80beb4abacacc4b5340776 (patch) | |
| tree | 2bceb8727e6866ec8d6bb5ecf919a9440c2c820f /railties/lib | |
| parent | 27710b1edaca452e2b5c0afb21af3d4e64d0b41c (diff) | |
| parent | 877a411d0c16baa4e670dae9a28f5cfcc201adc1 (diff) | |
| download | rails-b1c19eb05299fbae2a80beb4abacacc4b5340776.tar.gz rails-b1c19eb05299fbae2a80beb4abacacc4b5340776.tar.bz2 rails-b1c19eb05299fbae2a80beb4abacacc4b5340776.zip | |
Merge branch 'sprockets-3'
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index c243b0c60e..bc5c8052dc 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -218,8 +218,6 @@ module Rails def rails_gemfile_entry dev_edge_common = [ GemfileEntry.github('sprockets-rails', 'rails/sprockets-rails'), - GemfileEntry.github('sprockets', 'rails/sprockets'), - GemfileEntry.github('sass-rails', 'rails/sass-rails'), GemfileEntry.github('arel', 'rails/arel'), GemfileEntry.github('rack', 'rack/rack') ] |