diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-27 10:00:36 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-27 10:00:36 +0000 |
| commit | 1025b39058eec1b3a58cf8231edd6b2e3700ed22 (patch) | |
| tree | 2a6c6a603434de38163d2a60751024f0f7b29231 /Gemfile.lock | |
| parent | a584662ce825ab8b21772ae6d3086745f0d7e7ef (diff) | |
| parent | 65ec54a5918afd2c186de9668ba442666d75ff81 (diff) | |
| download | gitlab-ce-1025b39058eec1b3a58cf8231edd6b2e3700ed22.tar.gz | |
Merge branch 'zj-remove-deprecation-warnings-sprockets' into 'master'
Remove Sprockets deprecation warning
See merge request !6535
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 2a2f4d56dbe..1691f92c8ce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -644,7 +644,7 @@ GEM sanitize (2.1.0) nokogiri (>= 1.4.4) sass (3.4.22) - sass-rails (5.0.5) + sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) @@ -708,7 +708,7 @@ GEM sprockets (3.7.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-es6 (0.9.0) + sprockets-es6 (0.9.2) babel-source (>= 5.8.11) babel-transpiler sprockets (>= 3.0.0) @@ -944,7 +944,7 @@ DEPENDENCIES ruby-fogbugz (~> 0.2.1) ruby-prof (~> 0.15.9) sanitize (~> 2.0) - sass-rails (~> 5.0.0) + sass-rails (~> 5.0.6) scss_lint (~> 0.47.0) sdoc (~> 0.3.20) seed-fu (~> 2.3.5) @@ -964,7 +964,7 @@ DEPENDENCIES spring-commands-spinach (~> 1.1.0) spring-commands-teaspoon (~> 0.0.2) sprockets (~> 3.7.0) - sprockets-es6 + sprockets-es6 (~> 0.9.2) state_machines-activerecord (~> 0.4.0) sys-filesystem (~> 1.1.6) task_list (~> 1.0.2) |