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 | |
| 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')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -7,7 +7,7 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3' gem 'responders', '~> 2.0' gem 'sprockets', '~> 3.7.0' -gem 'sprockets-es6' +gem 'sprockets-es6', '~> 0.9.2' # Default values for AR models gem 'default_value_for', '~> 3.0.0' @@ -210,7 +210,7 @@ gem 'oj', '~> 2.17.4' gem 'chronic', '~> 0.10.2' gem 'chronic_duration', '~> 0.10.6' -gem 'sass-rails', '~> 5.0.0' +gem 'sass-rails', '~> 5.0.6' gem 'coffee-rails', '~> 4.1.0' gem 'uglifier', '~> 2.7.2' gem 'turbolinks', '~> 2.5.0' |