Merge branch 'update-gem' into 'master'
Update sprockets version to 3.7.0 Closes #22277 See merge request !6489
This commit is contained in:
commit
f1bfb87287
2 changed files with 3 additions and 5 deletions
4
Gemfile
4
Gemfile
|
@ -6,9 +6,7 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3'
|
|||
# Responders respond_to and respond_with
|
||||
gem 'responders', '~> 2.0'
|
||||
|
||||
# Specify a sprockets version due to increased performance
|
||||
# See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069
|
||||
gem 'sprockets', '~> 3.6.0'
|
||||
gem 'sprockets', '~> 3.7.0'
|
||||
gem 'sprockets-es6'
|
||||
|
||||
# Default values for AR models
|
||||
|
|
|
@ -705,7 +705,7 @@ GEM
|
|||
spring (>= 0.9.1)
|
||||
spring-commands-teaspoon (0.0.2)
|
||||
spring (>= 0.9.1)
|
||||
sprockets (3.6.3)
|
||||
sprockets (3.7.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (> 1, < 3)
|
||||
sprockets-es6 (0.9.0)
|
||||
|
@ -964,7 +964,7 @@ DEPENDENCIES
|
|||
spring-commands-rspec (~> 1.0.4)
|
||||
spring-commands-spinach (~> 1.1.0)
|
||||
spring-commands-teaspoon (~> 0.0.2)
|
||||
sprockets (~> 3.6.0)
|
||||
sprockets (~> 3.7.0)
|
||||
sprockets-es6
|
||||
state_machines-activerecord (~> 0.4.0)
|
||||
sys-filesystem (~> 1.1.6)
|
||||
|
|
Loading…
Reference in a new issue