Merge branch 'master' into go-go-gadget-webpack
Showing
... | @@ -220,8 +220,7 @@ gem 'chronic', '~> 0.10.2' | ... | @@ -220,8 +220,7 @@ gem 'chronic', '~> 0.10.2' |
gem 'chronic_duration', '~> 0.10.6' | gem 'chronic_duration', '~> 0.10.6' | ||
gem 'webpack-rails', '~> 0.9.9' | gem 'webpack-rails', '~> 0.9.9' | ||
gem 'sassc-rails', '~> 1.3.0' | |||
gem 'sass-rails', '~> 5.0.6' | |||
gem 'coffee-rails', '~> 4.1.0' | gem 'coffee-rails', '~> 4.1.0' | ||
gem 'uglifier', '~> 2.7.2' | gem 'uglifier', '~> 2.7.2' | ||
gem 'gitlab-turbolinks-classic', '~> 2.5', '>= 2.5.6' | gem 'gitlab-turbolinks-classic', '~> 2.5', '>= 2.5.6' | ||
... | @@ -257,7 +256,6 @@ group :development do | ... | @@ -257,7 +256,6 @@ group :development do |
gem 'brakeman', '~> 3.3.0', require: false | gem 'brakeman', '~> 3.3.0', require: false | ||
gem 'letter_opener_web', '~> 1.3.0' | gem 'letter_opener_web', '~> 1.3.0' | ||
gem 'rerun', '~> 0.11.0' | |||
gem 'bullet', '~> 5.2.0', require: false | gem 'bullet', '~> 5.2.0', require: false | ||
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false | gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false | ||
gem 'web-console', '~> 2.0' | gem 'web-console', '~> 2.0' | ||
... | @@ -288,7 +286,7 @@ group :development, :test do | ... | @@ -288,7 +286,7 @@ group :development, :test do |
gem 'minitest', '~> 5.7.0' | gem 'minitest', '~> 5.7.0' | ||
# Generate Fake data | # Generate Fake data | ||
gem 'ffaker', '~> 2.0.0' | gem 'ffaker', '~> 2.4' | ||
gem 'capybara', '~> 2.6.2' | gem 'capybara', '~> 2.6.2' | ||
gem 'capybara-screenshot', '~> 1.0.0' | gem 'capybara-screenshot', '~> 1.0.0' | ||
... | ... |
changelogs/unreleased/switch-to-sassc.yml
0 → 100644
features/admin/groups.feature
deleted
100644 → 0
features/steps/admin/groups.rb
deleted
100644 → 0
Please
register
or
sign in
to comment