diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-05-17 04:50:29 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-05-17 04:50:29 +0000 |
| commit | f7ebea045b6bb964072617efa5d4370f22badb7d (patch) | |
| tree | ad046cdd44ab4fd3b10cc96d639043da5718a220 | |
| parent | ef62eb238ff297896ee39b1b5479f7bc23bb1a46 (diff) | |
| parent | 80fa846aa91e6c0f623992fbdd4471a19048b494 (diff) | |
| download | gitlab-ce-f7ebea045b6bb964072617efa5d4370f22badb7d.tar.gz | |
Merge branch 'update-haml-lint-spec-helpers' into 'master'
Update haml_lint to include linter spec helpers
Closes #61892
See merge request gitlab-org/gitlab-ce!28379
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -360,7 +360,7 @@ group :development, :test do gem 'rubocop-rspec', '~> 1.22.1' gem 'scss_lint', '~> 0.56.0', require: false - gem 'haml_lint', '~> 0.30.0', require: false + gem 'haml_lint', '~> 0.31.0', require: false gem 'simplecov', '~> 0.14.0', require: false gem 'bundler-audit', '~> 0.5.0', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 8238ed4763e..94961354a2e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -360,7 +360,7 @@ GEM haml (5.0.4) temple (>= 0.8.0) tilt - haml_lint (0.30.0) + haml_lint (0.31.0) haml (>= 4.0, < 5.1) rainbow rake (>= 10, < 13) @@ -1089,7 +1089,7 @@ DEPENDENCIES graphiql-rails (~> 1.4.10) graphql (~> 1.8.0) grpc (~> 1.19.0) - haml_lint (~> 0.30.0) + haml_lint (~> 0.31.0) hamlit (~> 2.8.8) hangouts-chat (~> 0.0.5) hashie-forbidden_attributes |