summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-06-30 16:11:57 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-06-30 16:11:57 -0600
commit44230e12bb2a7ea3d91a6a9a2bfd1543198f1b9b (patch)
treeeb855c2e61b860d13b3f6a0708faae6f7b57befe /Gemfile.lock
parent3041c43380ba6e5d8bbc029a9dcfecfdcf7bcf47 (diff)
downloadgitlab-ce-44230e12bb2a7ea3d91a6a9a2bfd1543198f1b9b.tar.gz
Upgrade Sprockets and Sprockets Rails.
Upgrade Sprockets from 3.6.0 to 3.6.2. Changelog: https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md Upgrade Sprockets Rails from 3.0.4 to 3.1.1. Changelog: https://github.com/rails/sprockets-rails/compare/v3.0.4...v3.1.1
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index f99b373dbbd..5e5554d4fc9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -700,10 +700,10 @@ GEM
spring (>= 0.9.1)
spring-commands-teaspoon (0.0.2)
spring (>= 0.9.1)
- sprockets (3.6.0)
+ sprockets (3.6.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
- sprockets-rails (3.0.4)
+ sprockets-rails (3.1.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)