summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-02 08:56:25 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-02 08:56:25 +0000
commit5b0cada76443acbf54634189a66ecda01c7cdb26 (patch)
tree2ac634b2f693aac7db2d82e4de16372a509f6a7e
parent07bc0b43b021088fb3784a013b250c4127ff4e0b (diff)
parent940d689d1851540dfbe1d8c4861cf0bc129426fe (diff)
downloadgitlab-ce-5b0cada76443acbf54634189a66ecda01c7cdb26.tar.gz
Merge branch 'rs-update-sprockets' into 'master'
Bump sprockets to `~> 3.3.5` Closes #6069 See merge request !3055
-rw-r--r--Gemfile6
-rw-r--r--Gemfile.lock12
2 files changed, 7 insertions, 11 deletions
diff --git a/Gemfile b/Gemfile
index 76357d2b674..134646cf800 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,9 +6,9 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3'
# Responders respond_to and respond_with
gem 'responders', '~> 2.0'
-# Specify a sprockets version due to security issue
-# See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY
-gem 'sprockets', '~> 2.12.3'
+# Specify a sprockets version due to increased performance
+# See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069
+gem 'sprockets', '~> 3.3.5'
# Default values for AR models
gem "default_value_for", "~> 3.0.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 29563b18db1..e048e2f5a56 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -407,7 +407,6 @@ GEM
railties (>= 4.0.1)
hashie (3.4.3)
highline (1.7.8)
- hike (1.2.3)
hipchat (1.5.2)
httparty
mimemagic
@@ -771,11 +770,8 @@ GEM
spring (>= 0.9.1)
spring-commands-teaspoon (0.0.2)
spring (>= 0.9.1)
- sprockets (2.12.4)
- hike (~> 1.2)
- multi_json (~> 1.0)
- rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
+ sprockets (3.3.5)
+ rack (> 1, < 3)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
@@ -807,7 +803,7 @@ GEM
rack (~> 1.0)
thor (0.19.1)
thread_safe (0.3.5)
- tilt (1.4.1)
+ tilt (2.0.2)
timfel-krb5-auth (0.8.3)
tinder (1.10.1)
eventmachine (~> 1.0)
@@ -1024,7 +1020,7 @@ DEPENDENCIES
spring-commands-rspec (~> 1.0.4)
spring-commands-spinach (~> 1.0.0)
spring-commands-teaspoon (~> 0.0.2)
- sprockets (~> 2.12.3)
+ sprockets (~> 3.3.5)
state_machines-activerecord (~> 0.3.0)
task_list (~> 1.0.2)
teaspoon (~> 1.0.0)