summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2018-07-09 17:23:30 +0100
committerSean McGivern <sean@gitlab.com>2018-07-09 17:23:30 +0100
commit2a4039cf668c23156d49eae7f84837fb527f2549 (patch)
tree7add56decfeff4220bce9a840f700bffd98f395c /Gemfile
parentab3c91a702a6a38374d574488ba4841758842505 (diff)
parent72c99b58abe7bbc956804c9d403689e64f579d3e (diff)
downloadgitlab-ce-2a4039cf668c23156d49eae7f84837fb527f2549.tar.gz
Merge branch 'update-rubocop'
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 00ff75ae719..d575568adaa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -351,9 +351,9 @@ group :development, :test do
gem 'spring', '~> 2.0.0'
gem 'spring-commands-rspec', '~> 1.0.4'
- gem 'gitlab-styles', '~> 2.3', require: false
+ gem 'gitlab-styles', '~> 2.4', require: false
# Pin these dependencies, otherwise a new rule could break the CI pipelines
- gem 'rubocop', '~> 0.52.1'
+ gem 'rubocop', '~> 0.54.0'
gem 'rubocop-rspec', '~> 1.22.1'
gem 'scss_lint', '~> 0.56.0', require: false