summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-08-08 16:19:54 -0400
committerRobert Speicher <rspeicher@gmail.com>2017-08-08 16:19:54 -0400
commitacd270ae84f7597577f8d31ec603084e0981cfd5 (patch)
treeebdffdea3ed063c34464cc30509d45a4d784ee23
parent85c38ddb1dbe56de87d8e98b1cfdd76a0c67838a (diff)
downloadgitlab-ce-acd270ae84f7597577f8d31ec603084e0981cfd5.tar.gz
Correct `Gemfile.lock` for latest rubocop-gitlab-security gemspec
-rw-r--r--Gemfile.lock8
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 6c2fcc377ec..b865ff6ee32 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -548,7 +548,7 @@ GEM
rubypants (~> 0.2)
orm_adapter (0.5.0)
os (0.9.6)
- parallel (1.11.2)
+ parallel (1.12.0)
paranoia (2.3.1)
activerecord (>= 4.0, < 5.2)
parser (2.4.0.0)
@@ -741,9 +741,9 @@ GEM
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
- rubocop-rspec (1.15.1)
rubocop-gitlab-security (0.0.6)
- rubocop (>= 0.47.0)
+ rubocop (>= 0.47.1)
+ rubocop-rspec (1.15.1)
ruby-fogbugz (0.2.1)
crack (~> 0.4)
ruby-prof (0.16.2)
@@ -1089,8 +1089,8 @@ DEPENDENCIES
rspec-set (~> 0.1.3)
rspec_profiling (~> 0.0.5)
rubocop (~> 0.49.1)
- rubocop-rspec (~> 1.15.1)
rubocop-gitlab-security (~> 0.0.6)
+ rubocop-rspec (~> 1.15.1)
ruby-fogbugz (~> 0.2.1)
ruby-prof (~> 0.16.2)
ruby_parser (~> 3.8)