diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2017-08-07 09:08:15 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-08-07 09:08:15 +0000 |
| commit | bca5747d987106e838bb73a7052222f42fc864db (patch) | |
| tree | 94352047829a78d93f6c11553b14845fd931295b | |
| parent | e8a439ab68575bea85e46005412a4193f53366d7 (diff) | |
| download | gitlab-ce-bca5747d987106e838bb73a7052222f42fc864db.tar.gz | |
Upgrade haml_lint Gem to 0.26.0
| -rw-r--r-- | .haml-lint.yml | 15 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 9 | ||||
| -rw-r--r-- | app/views/projects/runners/edit.html.haml | 2 |
4 files changed, 22 insertions, 6 deletions
diff --git a/.haml-lint.yml b/.haml-lint.yml index 528f99d08d2..372994979b8 100644 --- a/.haml-lint.yml +++ b/.haml-lint.yml @@ -35,9 +35,18 @@ linters: HtmlAttributes: enabled: true + IdNames: + enabled: false + ImplicitDiv: enabled: true + InlineStyles: + enabled: false + + InstanceVariables: + enabled: false + LeadingCommentSpace: enabled: false @@ -54,6 +63,9 @@ linters: ObjectReferenceAttributes: enabled: true + RepeatedId: + enabled: false + RuboCop: enabled: false # These cops are incredibly noisy when it comes to HAML templates, so we @@ -101,3 +113,6 @@ linters: UnnecessaryStringOutput: enabled: true + + ViewLength: + enabled: false @@ -342,7 +342,7 @@ group :development, :test do gem 'rubocop', '~> 0.49.1', require: false gem 'rubocop-rspec', '~> 1.15.1', require: false gem 'scss_lint', '~> 0.54.0', require: false - gem 'haml_lint', '~> 0.21.0', require: false + gem 'haml_lint', '~> 0.26.0', require: false gem 'simplecov', '~> 0.14.0', require: false gem 'flay', '~> 2.8.0', require: false gem 'bundler-audit', '~> 0.5.0', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 57cfe0a9de0..04d17d54636 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -356,10 +356,11 @@ GEM googleauth (~> 0.5.1) haml (4.0.7) tilt - haml_lint (0.21.0) - haml (~> 4.0) + haml_lint (0.26.0) + haml (>= 4.0, < 5.1) + rainbow rake (>= 10, < 13) - rubocop (>= 0.47.0) + rubocop (>= 0.49.0) sysexits (~> 1.1) hamlit (2.6.1) temple (~> 0.7.6) @@ -987,7 +988,7 @@ DEPENDENCIES grape (~> 0.19.2) grape-entity (~> 0.6.0) grape-route-helpers (~> 2.0.0) - haml_lint (~> 0.21.0) + haml_lint (~> 0.26.0) hamlit (~> 2.6.1) hashie-forbidden_attributes health_check (~> 2.6.0) diff --git a/app/views/projects/runners/edit.html.haml b/app/views/projects/runners/edit.html.haml index 95706888655..78dc4817ed7 100644 --- a/app/views/projects/runners/edit.html.haml +++ b/app/views/projects/runners/edit.html.haml @@ -3,4 +3,4 @@ %h4 Runner ##{@runner.id} %hr - = render 'form', runner: @runner, runner_form_url: runner_path(@runner) + = render 'form', runner: @runner, runner_form_url: runner_path(@runner) |