diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-03 15:08:55 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-03 15:08:55 +0300 |
| commit | 2ac811ce685f906d3e54e78b23f61495c19ad595 (patch) | |
| tree | 53b569e06a94fa57cffd5e2594b27db78af1fc26 /Gemfile.lock | |
| parent | d43cf10712ecebf3f8d41df265e128d78b57da82 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e9d63891d91..5c77e1a92cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -548,8 +548,9 @@ GEM haml (5.1.2) temple (>= 0.8.0) tilt - haml_lint (0.34.0) - haml (>= 4.0, < 5.2) + haml_lint (0.36.0) + haml (>= 4.0, < 5.3) + parallel (~> 1.10) rainbow rubocop (>= 0.50.0) sysexits (~> 1.1) @@ -1370,7 +1371,7 @@ DEPENDENCIES grpc (~> 1.30.2) gssapi guard-rspec - haml_lint (~> 0.34.0) + haml_lint (~> 0.36.0) hamlit (~> 2.11.0) hangouts-chat (~> 0.0.5) hashie |