diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-11-13 08:41:25 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-11-13 08:41:25 +0000 |
| commit | 474b502afe250e85942866d9a2fae18fb5b04583 (patch) | |
| tree | 5b31102b489bd1456dc3dd4d03415aaa73d888c1 | |
| parent | 1818570c17c3bfc080721fa44d77c2c5647e16a5 (diff) | |
| parent | c94efdaccf8d067065a2997c0129f339194268a9 (diff) | |
| download | gitlab-ce-474b502afe250e85942866d9a2fae18fb5b04583.tar.gz | |
Merge branch '53289-update-haml_lint-to-0-28-0' into 'master'
Update haml_lint to 0.28.0
Closes #53289
See merge request gitlab-org/gitlab-ce!22660
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | Gemfile.rails5.lock | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/53289-update-haml_lint-to-0-28-0.yml | 5 |
4 files changed, 12 insertions, 7 deletions
@@ -357,7 +357,7 @@ group :development, :test do gem 'rubocop-rspec', '~> 1.22.1' gem 'scss_lint', '~> 0.56.0', require: false - gem 'haml_lint', '~> 0.26.0', require: false + gem 'haml_lint', '~> 0.28.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 0676fad16f0..23261373c2b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -337,11 +337,11 @@ GEM haml (5.0.4) temple (>= 0.8.0) tilt - haml_lint (0.26.0) + haml_lint (0.28.0) haml (>= 4.0, < 5.1) rainbow rake (>= 10, < 13) - rubocop (>= 0.49.0) + rubocop (>= 0.50.0) sysexits (~> 1.1) hamlit (2.8.8) temple (>= 0.8.0) @@ -1013,7 +1013,7 @@ DEPENDENCIES graphiql-rails (~> 1.4.10) graphql (~> 1.8.0) grpc (~> 1.15.0) - haml_lint (~> 0.26.0) + haml_lint (~> 0.28.0) hamlit (~> 2.8.8) hangouts-chat (~> 0.0.5) hashie-forbidden_attributes diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index 74eb70edb7c..8893088446b 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -340,11 +340,11 @@ GEM haml (5.0.4) temple (>= 0.8.0) tilt - haml_lint (0.26.0) + haml_lint (0.28.0) haml (>= 4.0, < 5.1) rainbow rake (>= 10, < 13) - rubocop (>= 0.49.0) + rubocop (>= 0.50.0) sysexits (~> 1.1) hamlit (2.8.8) temple (>= 0.8.0) @@ -1022,7 +1022,7 @@ DEPENDENCIES graphiql-rails (~> 1.4.10) graphql (~> 1.8.0) grpc (~> 1.15.0) - haml_lint (~> 0.26.0) + haml_lint (~> 0.28.0) hamlit (~> 2.8.8) hangouts-chat (~> 0.0.5) hashie-forbidden_attributes diff --git a/changelogs/unreleased/53289-update-haml_lint-to-0-28-0.yml b/changelogs/unreleased/53289-update-haml_lint-to-0-28-0.yml new file mode 100644 index 00000000000..9a16666c416 --- /dev/null +++ b/changelogs/unreleased/53289-update-haml_lint-to-0-28-0.yml @@ -0,0 +1,5 @@ +--- +title: Update haml_lint to 0.28.0 +merge_request: 22660 +author: Takuya Noguchi +type: other |