diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-07-04 16:13:59 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-07-09 21:13:08 +0800 |
| commit | 5cd7b8033a842e3cde19d3981a3cde3800fdd7f8 (patch) | |
| tree | 78e20ad93aa4b7295ae7c58d48f624d04d912bd4 | |
| parent | 3bfe30662436e48d4324b8fac5c1634df4a7cf7f (diff) | |
| download | gitlab-ce-5cd7b8033a842e3cde19d3981a3cde3800fdd7f8.tar.gz | |
Use latest gitlab-styles
| -rw-r--r-- | .rubocop.yml | 6 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | Gemfile.rails5.lock | 4 |
3 files changed, 4 insertions, 10 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index d0584b46b06..0582bfe8d70 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -31,12 +31,6 @@ Style/MutableConstant: - 'ee/db/post_migrate/**/*' - 'ee/db/geo/migrate/**/*' -Naming/UncommunicativeMethodParamName: - Enabled: false - -Naming/MemoizedInstanceVariableName: - Enabled: false - Naming/FileName: ExpectMatchingDefinition: true Exclude: diff --git a/Gemfile.lock b/Gemfile.lock index ad0675ddb8f..7ca3d5f9eda 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -312,7 +312,7 @@ GEM mime-types (>= 1.16) posix-spawn (~> 0.3) gitlab-markup (1.6.4) - gitlab-styles (2.4.0) + gitlab-styles (2.4.1) rubocop (~> 0.54.0) rubocop-gitlab-security (~> 0.1.0) rubocop-rspec (~> 1.19) @@ -785,7 +785,7 @@ GEM unicode-display_width (~> 1.0, >= 1.0.1) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-rspec (1.22.1) + rubocop-rspec (1.22.2) rubocop (>= 0.52.1) ruby-enum (0.7.2) i18n diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index e167bbcb52e..1aeaef4202d 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -315,7 +315,7 @@ GEM mime-types (>= 1.16) posix-spawn (~> 0.3) gitlab-markup (1.6.4) - gitlab-styles (2.4.0) + gitlab-styles (2.4.1) rubocop (~> 0.54.0) rubocop-gitlab-security (~> 0.1.0) rubocop-rspec (~> 1.19) @@ -794,7 +794,7 @@ GEM unicode-display_width (~> 1.0, >= 1.0.1) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-rspec (1.22.1) + rubocop-rspec (1.22.2) rubocop (>= 0.52.1) ruby-enum (0.7.2) i18n |