summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2019-05-06 01:05:38 +0000
committerAsh McKenzie <amckenzie@gitlab.com>2019-05-06 01:05:38 +0000
commitcf1fc5a1e81026b592bcbc88922cb96753472388 (patch)
treeb0c4e3095d1c626d6269f8238a3c07d0dbca74c3 /qa
parentb08014a4508da9ea72a3124d8be5bea93e4b6a0b (diff)
parentf93b2e02a56a3b1f3041119e8302d43aeafc8284 (diff)
downloadgitlab-ce-cf1fc5a1e81026b592bcbc88922cb96753472388.tar.gz
Merge branch 'sh-upgrade-rubocop-0.68.0-ce' into 'master'
Upgrade to Rubocop 0.68.1 See merge request gitlab-org/gitlab-ce!28046
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/page/project/settings/ci_cd.rb1
-rw-r--r--qa/qa/runtime/key/ecdsa.rb1
-rw-r--r--qa/qa/runtime/key/ed25519.rb1
3 files changed, 0 insertions, 3 deletions
diff --git a/qa/qa/page/project/settings/ci_cd.rb b/qa/qa/page/project/settings/ci_cd.rb
index 44a62cf6ccf..b8c5c563da6 100644
--- a/qa/qa/page/project/settings/ci_cd.rb
+++ b/qa/qa/page/project/settings/ci_cd.rb
@@ -1,4 +1,3 @@
-# rubocop:disable Naming/FileName
# frozen_string_literal: true
module QA
diff --git a/qa/qa/runtime/key/ecdsa.rb b/qa/qa/runtime/key/ecdsa.rb
index 6e5c0a2deca..46a1e5f54cf 100644
--- a/qa/qa/runtime/key/ecdsa.rb
+++ b/qa/qa/runtime/key/ecdsa.rb
@@ -1,4 +1,3 @@
-# rubocop:disable Naming/FileName
# frozen_string_literal: true
module QA
diff --git a/qa/qa/runtime/key/ed25519.rb b/qa/qa/runtime/key/ed25519.rb
index 53b556d744d..3a3567d55da 100644
--- a/qa/qa/runtime/key/ed25519.rb
+++ b/qa/qa/runtime/key/ed25519.rb
@@ -1,4 +1,3 @@
-# rubocop:disable Naming/FileName
# frozen_string_literal: true
module QA