diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-07 12:10:24 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-07 12:10:24 +0000 |
| commit | e227f482346aa39655cdebb5a59eeef78e1e12b4 (patch) | |
| tree | 1b33c8d71e3f3aeae5d7cdcdbf18643512d632b4 /tooling | |
| parent | d51d5adf94ad965af8433ce6f74a81cfef5669e1 (diff) | |
| download | gitlab-ce-e227f482346aa39655cdebb5a59eeef78e1e12b4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'tooling')
| -rw-r--r-- | tooling/overcommit/Gemfile | 2 | ||||
| -rw-r--r-- | tooling/overcommit/Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tooling/overcommit/Gemfile b/tooling/overcommit/Gemfile index 52e8dcaa497..6d2c5bce29a 100644 --- a/tooling/overcommit/Gemfile +++ b/tooling/overcommit/Gemfile @@ -4,6 +4,6 @@ source 'https://rubygems.org' gem 'overcommit' -gem 'gitlab-styles', '~> 5.3.0', require: false +gem 'gitlab-styles', '~> 5.4.0', require: false gem 'scss_lint', '~> 0.56.0', require: false gem 'haml_lint', '~> 0.34.0', require: false diff --git a/tooling/overcommit/Gemfile.lock b/tooling/overcommit/Gemfile.lock index b46229ac9f8..f1d701b3e4b 100644 --- a/tooling/overcommit/Gemfile.lock +++ b/tooling/overcommit/Gemfile.lock @@ -11,7 +11,7 @@ GEM childprocess (3.0.0) concurrent-ruby (1.1.7) ffi (1.12.2) - gitlab-styles (5.3.0) + gitlab-styles (5.4.0) rubocop (~> 0.89.1) rubocop-gitlab-security (~> 0.1.0) rubocop-performance (~> 1.8.1) @@ -88,7 +88,7 @@ PLATFORMS ruby DEPENDENCIES - gitlab-styles (~> 5.3.0) + gitlab-styles (~> 5.4.0) haml_lint (~> 0.34.0) overcommit scss_lint (~> 0.56.0) |