diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-17 18:09:28 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-17 18:09:28 +0300 |
| commit | 6535cf9c79362862c31ea7d26c61541b84db18d9 (patch) | |
| tree | 6d646edcf11d38e8ac23bceed1340ff8907b850d /tooling/overcommit | |
| parent | 9a8f801d7352b7965fe690a599410fb50005ce67 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'tooling/overcommit')
| -rw-r--r-- | tooling/overcommit/Gemfile | 2 | ||||
| -rw-r--r-- | tooling/overcommit/Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tooling/overcommit/Gemfile b/tooling/overcommit/Gemfile index 571ea1862a5..08f08018ffb 100644 --- a/tooling/overcommit/Gemfile +++ b/tooling/overcommit/Gemfile @@ -4,6 +4,6 @@ source 'https://rubygems.org' gem 'overcommit' -gem 'gitlab-styles', '~> 5.0.0', require: false +gem 'gitlab-styles', '~> 5.1.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 6527ad3fcda..5bada88e1dc 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.0.0) + gitlab-styles (5.1.0) rubocop (~> 0.89.1) rubocop-gitlab-security (~> 0.1.0) rubocop-performance (~> 1.8.1) @@ -79,7 +79,7 @@ GEM temple (0.8.2) thread_safe (0.3.6) tilt (2.0.10) - tzinfo (1.2.7) + tzinfo (1.2.8) thread_safe (~> 0.1) unicode-display_width (1.7.0) zeitwerk (2.4.1) @@ -88,7 +88,7 @@ PLATFORMS ruby DEPENDENCIES - gitlab-styles (~> 5.0.0) + gitlab-styles (~> 5.1.0) haml_lint (~> 0.34.0) overcommit scss_lint (~> 0.56.0) |