diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /tooling/overcommit | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'tooling/overcommit')
-rw-r--r-- | tooling/overcommit/Gemfile | 2 | ||||
-rw-r--r-- | tooling/overcommit/Gemfile.lock | 61 |
2 files changed, 40 insertions, 23 deletions
diff --git a/tooling/overcommit/Gemfile b/tooling/overcommit/Gemfile index 5525662e43e..120cb1ad8d0 100644 --- a/tooling/overcommit/Gemfile +++ b/tooling/overcommit/Gemfile @@ -4,6 +4,6 @@ source 'https://rubygems.org' gem 'overcommit' -gem 'gitlab-styles', '~> 3.1.0', require: false +gem 'gitlab-styles', '~> 4.2.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 15b80426c03..7ab10f741ed 100644 --- a/tooling/overcommit/Gemfile.lock +++ b/tooling/overcommit/Gemfile.lock @@ -1,55 +1,68 @@ GEM remote: https://rubygems.org/ specs: + activesupport (6.0.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) ast (2.4.0) childprocess (3.0.0) - ffi (1.12.1) - gitlab-styles (3.1.0) - rubocop (~> 0.74.0) + concurrent-ruby (1.1.6) + ffi (1.12.2) + gitlab-styles (4.2.0) + rubocop (~> 0.82.0) rubocop-gitlab-security (~> 0.1.0) - rubocop-performance (~> 1.4.1) - rubocop-rails (~> 2.0) + rubocop-performance (~> 1.5.2) + rubocop-rails (~> 2.5) rubocop-rspec (~> 1.36) haml (5.1.2) temple (>= 0.8.0) tilt - haml_lint (0.34.1) + haml_lint (0.34.0) haml (>= 4.0, < 5.2) rainbow rubocop (>= 0.50.0) sysexits (~> 1.1) - iniparse (1.4.4) + i18n (1.8.2) + concurrent-ruby (~> 1.0) + iniparse (1.5.0) jaro_winkler (1.5.4) - overcommit (0.52.1) + minitest (5.11.3) + overcommit (0.53.0) childprocess (>= 0.6.3, < 4) iniparse (~> 1.4) parallel (1.19.1) - parser (2.7.0.2) + parser (2.7.1.2) ast (~> 2.4.0) - rack (2.1.1) + rack (2.0.9) rainbow (3.0.0) rake (12.3.3) - rb-fsevent (0.10.3) - rb-inotify (0.10.1) - ffi (~> 1.0) - rubocop (0.74.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + rexml (3.2.4) + rubocop (0.82.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) + rexml ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) + unicode-display_width (>= 1.4.0, < 2.0) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-performance (1.4.1) + rubocop-performance (1.5.2) rubocop (>= 0.71.0) - rubocop-rails (2.4.1) + rubocop-rails (2.5.2) + activesupport rack (>= 1.1) rubocop (>= 0.72.0) - rubocop-rspec (1.37.1) + rubocop-rspec (1.37.0) rubocop (>= 0.68.1) ruby-progressbar (1.10.1) - sass (3.5.7) + sass (3.5.5) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -59,14 +72,18 @@ GEM sass (~> 3.5.3) sysexits (1.2.0) temple (0.8.2) + thread_safe (0.3.6) tilt (2.0.10) - unicode-display_width (1.6.1) + tzinfo (1.2.7) + thread_safe (~> 0.1) + unicode-display_width (1.7.0) + zeitwerk (2.3.0) PLATFORMS ruby DEPENDENCIES - gitlab-styles (~> 3.1.0) + gitlab-styles (~> 4.2.0) haml_lint (~> 0.34.0) overcommit scss_lint (~> 0.56.0) |