Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b-existing
Showing
This diff is collapsed.
... | ... | @@ -295,7 +295,7 @@ group :development, :test do |
gem 'spring-commands-spinach', '~> 1.1.0' | ||
gem 'spring-commands-teaspoon', '~> 0.0.2' | ||
gem 'rubocop', '~> 0.42.0', require: false | ||
gem 'rubocop', '~> 0.43.0', require: false | ||
gem 'rubocop-rspec', '~> 1.5.0', require: false | ||
gem 'scss_lint', '~> 0.47.0', require: false | ||
gem 'haml_lint', '~> 0.18.2', require: false | ||
... | ... |