summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-11-21 10:27:05 +0000
committerRémy Coutable <remy@rymai.me>2018-11-21 10:27:05 +0000
commit98fd36274a530423399a9a4a0920e48ab82147cd (patch)
tree1a747412a2fa0fe0bf2e9317a51e8e1e974e4585
parent6332076e69bc521c2e1d9b92bf8d58bbf9dd672d (diff)
parentc2d27a6a5b1245e81668251781854bf9af6959f5 (diff)
downloadgitlab-ce-98fd36274a530423399a9a4a0920e48ab82147cd.tar.gz
Merge branch 'frozen-string-lib-rubocop' into 'master'
Enable Rubocop on lib/gitlab See merge request gitlab-org/gitlab-ce!23259
-rw-r--r--.rubocop.yml1
-rw-r--r--changelogs/unreleased/frozen-string-lib-rubocop.yml5
2 files changed, 5 insertions, 1 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index a95ded8af1c..741403af009 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -50,7 +50,6 @@ Style/FrozenStringLiteralComment:
- 'danger/**/*'
- 'db/**/*'
- 'ee/**/*'
- - 'lib/gitlab/**/*'
- 'lib/tasks/**/*'
- 'qa/**/*'
- 'rubocop/**/*'
diff --git a/changelogs/unreleased/frozen-string-lib-rubocop.yml b/changelogs/unreleased/frozen-string-lib-rubocop.yml
new file mode 100644
index 00000000000..9fe342e251b
--- /dev/null
+++ b/changelogs/unreleased/frozen-string-lib-rubocop.yml
@@ -0,0 +1,5 @@
+---
+title: Enable Rubocop on lib/gitlab
+merge_request:
+author: gfyoung
+type: other