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 /Gemfile | |
| 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 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -20,9 +20,7 @@ gem 'turbolinks', github: 'rails/turbolinks', branch: 'master' gem 'arel', github: 'rails/arel', branch: 'master' gem 'mail', github: 'mikel/mail', branch: 'master' -gem 'sprockets', '~> 4.0', github: 'rails/sprockets', branch: 'master' gem 'sprockets-rails', '~> 3.0.0.beta3', github: 'rails/sprockets-rails', branch: 'master' -gem 'sass-rails', github: 'rails/sass-rails', branch: 'master' # require: false so bcrypt is loaded only when has_secure_password is used. # This is to avoid Active Model (and by extension the entire framework) |