summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-08-08 19:31:24 +0000
committerRobert Speicher <robert@gitlab.com>2017-08-08 19:31:24 +0000
commit85c38ddb1dbe56de87d8e98b1cfdd76a0c67838a (patch)
tree90b319cc31dc7b22e989e7c160bab4131cdb2c36 /Gemfile.lock
parentb9da47d3b2c376ef8d0f6a951c0256bbc58b2854 (diff)
parent9770c57fab0315865a33c8b6df269eded0d57b5c (diff)
downloadgitlab-ce-85c38ddb1dbe56de87d8e98b1cfdd76a0c67838a.tar.gz
Merge branch 'add-rubocop-gitlab-security' into 'master'
Add rubocop-gitlab-security gem See merge request !12177
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 3 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 948ba02a72c..6c2fcc377ec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -742,7 +742,8 @@ GEM
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
rubocop-rspec (1.15.1)
- rubocop (>= 0.42.0)
+ rubocop-gitlab-security (0.0.6)
+ rubocop (>= 0.47.0)
ruby-fogbugz (0.2.1)
crack (~> 0.4)
ruby-prof (0.16.2)
@@ -1089,6 +1090,7 @@ DEPENDENCIES
rspec_profiling (~> 0.0.5)
rubocop (~> 0.49.1)
rubocop-rspec (~> 1.15.1)
+ rubocop-gitlab-security (~> 0.0.6)
ruby-fogbugz (~> 0.2.1)
ruby-prof (~> 0.16.2)
ruby_parser (~> 3.8)