diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-26 11:25:07 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-26 11:25:07 +0000 |
| commit | f1bfb872877df7baf36d2de1ad5dfdb4c8604c9b (patch) | |
| tree | faaee4a40752dbdde4bdd88d78ce2a88f15c811b | |
| parent | ebc4299d8c025601a0e6ca8066252b3132349291 (diff) | |
| parent | 3c46dbc98a024341226d67f8cc4b3600fcd3c14a (diff) | |
| download | gitlab-ce-f1bfb872877df7baf36d2de1ad5dfdb4c8604c9b.tar.gz | |
Merge branch 'update-gem' into 'master'
Update sprockets version to 3.7.0
Closes #22277
See merge request !6489
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 5 deletions
@@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index 1db8c9dd8c8..396e692847b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) |