Merge branch 'ce-to-ee-2018-01-08' into 'master'
CE upstream - Monday Closes gitlab-qa#149, gitaly#857, #3968, and gitlab-ce#41624 See merge request gitlab-org/gitlab-ee!3956
Showing
... | ... | @@ -351,7 +351,7 @@ group :development, :test do |
gem 'rubocop', '~> 0.52.0' | ||
gem 'rubocop-rspec', '~> 1.20.1' | ||
gem 'scss_lint', '~> 0.54.0', require: false | ||
gem 'scss_lint', '~> 0.56.0', require: false | ||
gem 'haml_lint', '~> 0.26.0', require: false | ||
gem 'simplecov', '~> 0.14.0', require: false | ||
gem 'flay', '~> 2.8.0', require: false | ||
... | ... |
qa/qa/runtime/env.rb
0 → 100644
qa/spec/runtime/env_spec.rb
0 → 100644
This diff is collapsed.
Please register or sign in to comment