Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorconnorshea <connor.james.shea@gmail.com>2016-04-09 17:29:57 +0300
committerconnorshea <connor.james.shea@gmail.com>2016-04-09 17:29:57 +0300
commit1647e3e8849991629f5ebf1a11f9ca06e8f741ea (patch)
tree22407e3bdf1aacdfef072853be2755212168e0fb /Gemfile.lock
parentcedcc1453cbbd4a8ba43cf932b8765d891f19e0c (diff)
Upgrade Sprockets from 3.3.5 to 3.6.0.
Sprockets 3.5.0 reintroduces GZIP-ing and 3.6.0 includes performance improvements. Changelog: https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md Resolves #14344.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock5
1 files changed, 3 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 7eb4080183d..28b71ac7bc8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -776,7 +776,8 @@ GEM
spring (>= 0.9.1)
spring-commands-teaspoon (0.0.2)
spring (>= 0.9.1)
- sprockets (3.3.5)
+ sprockets (3.6.0)
+ concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.4)
actionpack (>= 4.0)
@@ -1033,7 +1034,7 @@ DEPENDENCIES
spring-commands-rspec (~> 1.0.4)
spring-commands-spinach (~> 1.0.0)
spring-commands-teaspoon (~> 0.0.2)
- sprockets (~> 3.3.5)
+ sprockets (~> 3.6.0)
state_machines-activerecord (~> 0.3.0)
task_list (~> 1.0.2)
teaspoon (~> 1.1.0)