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:
authorRobert Speicher <rspeicher@gmail.com>2015-12-23 01:04:41 +0300
committerRobert Speicher <rspeicher@gmail.com>2015-12-23 01:04:41 +0300
commit66aaaf1fc1c34291d68ac93295dfdec13c85b871 (patch)
tree625c3d339c79b06a392ceb4669568597aa5f04b3 /Gemfile.lock
parent3b61dc47ec377b857b66f9b2a81a183276163f4e (diff)
Bump sass-rails to ~> 5.0.0
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock13
1 files changed, 7 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index b8517d932a4..21f405de2f2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -647,12 +647,13 @@ GEM
safe_yaml (1.0.4)
sanitize (2.1.0)
nokogiri (>= 1.4.4)
- sass (3.2.19)
- sass-rails (4.0.5)
+ sass (3.4.20)
+ sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
- sass (~> 3.2.2)
- sprockets (~> 2.8, < 3.0)
- sprockets-rails (~> 2.0)
+ sass (~> 3.1)
+ sprockets (>= 2.8, < 4.0)
+ sprockets-rails (>= 2.0, < 4.0)
+ tilt (>= 1.1, < 3)
sawyer (0.6.0)
addressable (~> 2.3.5)
faraday (~> 0.8, < 0.10)
@@ -934,7 +935,7 @@ DEPENDENCIES
rubocop (~> 0.35.0)
ruby-fogbugz (~> 0.2.1)
sanitize (~> 2.0)
- sass-rails (~> 4.0.5)
+ sass-rails (~> 5.0.0)
sdoc (~> 0.3.20)
seed-fu (~> 2.3.5)
select2-rails (~> 3.5.9)