summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-01-17 08:34:07 -0500
committerPhil Hughes <me@iamphill.com>2017-01-17 08:34:07 -0500
commitc0ba747c586ff7f5f42097a0e49eace30c57ebdf (patch)
tree89b58aa0b6162f4aee0bd8f834cc65e12e6c6c85 /Gemfile
parentdc623cf44e691cfe3e53decf66e36c25394dadb3 (diff)
parente7fdb1aae5a61b30f66ea3489d4e0759ed8ea3a1 (diff)
downloadgitlab-ce-c0ba747c586ff7f5f42097a0e49eace30c57ebdf.tar.gz
Merge branch 'master' into go-go-gadget-webpack
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile6
1 files changed, 2 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index c72780a5141..7327c99433a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -220,8 +220,7 @@ gem 'chronic', '~> 0.10.2'
gem 'chronic_duration', '~> 0.10.6'
gem 'webpack-rails', '~> 0.9.9'
-
-gem 'sass-rails', '~> 5.0.6'
+gem 'sassc-rails', '~> 1.3.0'
gem 'coffee-rails', '~> 4.1.0'
gem 'uglifier', '~> 2.7.2'
gem 'gitlab-turbolinks-classic', '~> 2.5', '>= 2.5.6'
@@ -257,7 +256,6 @@ group :development do
gem 'brakeman', '~> 3.3.0', require: false
gem 'letter_opener_web', '~> 1.3.0'
- gem 'rerun', '~> 0.11.0'
gem 'bullet', '~> 5.2.0', require: false
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
gem 'web-console', '~> 2.0'
@@ -288,7 +286,7 @@ group :development, :test do
gem 'minitest', '~> 5.7.0'
# Generate Fake data
- gem 'ffaker', '~> 2.0.0'
+ gem 'ffaker', '~> 2.4'
gem 'capybara', '~> 2.6.2'
gem 'capybara-screenshot', '~> 1.0.0'