From 3c46dbc98a024341226d67f8cc4b3600fcd3c14a Mon Sep 17 00:00:00 2001
From: ubudzisz <ubudzisz@gmail.com>
Date: Tue, 20 Sep 2016 22:27:18 +0200
Subject: [PATCH] update sprockets version
update sprockets version
---
Gemfile | 4 +---
Gemfile.lock | 4 ++--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/Gemfile b/Gemfile
index 21b31e8f01d..ff2ba1598cc 100644
--- a/Gemfile
+++ b/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
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)
--
GitLab