diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2015-09-29 13:22:56 -0700 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2015-09-29 13:22:56 -0700 |
| commit | bb25c671c8c201e3dccdb1aa001abbabb4597b35 (patch) | |
| tree | a9ae0f43b023e854849e52ded92ecba9b98c62a8 /Gemfile | |
| parent | 3a512162beb0fc46ccbb5f41505e4295a122df62 (diff) | |
| parent | 20ec1e922cc141364881b17e2509c4d7dccca695 (diff) | |
| download | rails-bb25c671c8c201e3dccdb1aa001abbabb4597b35.tar.gz rails-bb25c671c8c201e3dccdb1aa001abbabb4597b35.tar.bz2 rails-bb25c671c8c201e3dccdb1aa001abbabb4597b35.zip | |
Merge pull request #21794 from jeremy/sprockets/move-asset-manifest-from-toplevel-to-config-subdir
Eliminate overlapping `app/assets` load path
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -5,6 +5,10 @@ gemspec # We need a newish Rake since Active Job sets its test tasks' descriptions. gem 'rake', '>= 10.3' +# Active Support depends on a prerelease concurrent-ruby 1.0.0, so track +# latest master as it approaches release. +gem 'concurrent-ruby', '~> 1.0.0.pre2', github: 'ruby-concurrency/concurrent-ruby' + # Active Job depends on the URI::GID::MissingModelIDError, which isn't released yet. gem 'globalid', github: 'rails/globalid', branch: 'master' gem 'rack', github: 'rack/rack', branch: 'master' @@ -21,8 +25,8 @@ gem 'turbolinks', github: 'rails/turbolinks', branch: 'master' gem 'arel', github: 'rails/arel', branch: 'master' gem 'mail', github: 'mikel/mail', branch: 'master' -gem 'sprockets', github: 'rails/sprockets', branch: 'master' -gem 'sprockets-rails', github: 'rails/sprockets-rails', 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. |