diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2019-05-22 06:05:04 +0000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-05-22 06:05:04 +0000 |
| commit | c342c07899ef6637eef7c1df2534f0c5ea67d7bd (patch) | |
| tree | 02bb4da366341993965c875f77b141535520082b | |
| parent | a6e2ec0d954a14bd0ff4b1f37b3f6889eea28fde (diff) | |
| parent | 27381e22a92453b23f1ed75406970b37d926f1ec (diff) | |
| download | gitlab-ce-c342c07899ef6637eef7c1df2534f0c5ea67d7bd.tar.gz | |
Merge branch 'sh-fix-linter-registry-haml-try2' into 'master'
Fix uninitialized constant with HamlLint::LinterRegistry
Closes #62125
See merge request gitlab-org/gitlab-ce!28578
| -rw-r--r-- | .haml-lint.yml | 2 | ||||
| -rw-r--r-- | haml_lint/inline_javascript.rb (renamed from lib/haml_lint/inline_javascript.rb) | 2 | ||||
| -rw-r--r-- | haml_lint/linter/no_plain_nodes.rb (renamed from lib/haml_lint/linter/no_plain_nodes.rb) | 2 | ||||
| -rw-r--r-- | lib/tasks/haml-lint.rake | 2 | ||||
| -rw-r--r-- | spec/haml_lint/linter/no_plain_nodes_spec.rb (renamed from spec/lib/haml_lint/linter/no_plain_nodes_spec.rb) | 1 |
5 files changed, 5 insertions, 4 deletions
diff --git a/.haml-lint.yml b/.haml-lint.yml index 9f3676fa080..0412b24a48c 100644 --- a/.haml-lint.yml +++ b/.haml-lint.yml @@ -7,7 +7,7 @@ exclude: - 'vendor/**/*' - 'spec/**/*' require: - - './lib/haml_lint/linter/no_plain_nodes.rb' + - './haml_lint/linter/no_plain_nodes.rb' linters: AltText: diff --git a/lib/haml_lint/inline_javascript.rb b/haml_lint/inline_javascript.rb index 1b17162f71d..da6af92e82b 100644 --- a/lib/haml_lint/inline_javascript.rb +++ b/haml_lint/inline_javascript.rb @@ -7,7 +7,7 @@ unless Rails.env.production? module HamlLint class Linter::InlineJavaScript < Linter - include LinterRegistry + include ::HamlLint::LinterRegistry def visit_filter(node) return unless node.filter_type == 'javascript' diff --git a/lib/haml_lint/linter/no_plain_nodes.rb b/haml_lint/linter/no_plain_nodes.rb index d5cea0d07cf..c39f61fa80d 100644 --- a/lib/haml_lint/linter/no_plain_nodes.rb +++ b/haml_lint/linter/no_plain_nodes.rb @@ -5,7 +5,7 @@ require 'active_support/core_ext/array/grouping' module HamlLint class Linter class NoPlainNodes < Linter - include LinterRegistry + include ::HamlLint::LinterRegistry def visit_tag(node) if inline_plain_node?(node) diff --git a/lib/tasks/haml-lint.rake b/lib/tasks/haml-lint.rake index 786efd14b1a..305e15d69d5 100644 --- a/lib/tasks/haml-lint.rake +++ b/lib/tasks/haml-lint.rake @@ -1,6 +1,6 @@ unless Rails.env.production? require 'haml_lint/rake_task' - require 'haml_lint/inline_javascript' + require Rails.root.join('haml_lint/inline_javascript') # Workaround for warnings from parser/current # Keep it even if it no longer emits any warnings, diff --git a/spec/lib/haml_lint/linter/no_plain_nodes_spec.rb b/spec/haml_lint/linter/no_plain_nodes_spec.rb index 99cc9b9bc8d..08deb5a4e9e 100644 --- a/spec/lib/haml_lint/linter/no_plain_nodes_spec.rb +++ b/spec/haml_lint/linter/no_plain_nodes_spec.rb @@ -3,6 +3,7 @@ require 'spec_helper' require 'haml_lint' require 'haml_lint/spec' +require Rails.root.join('haml_lint/linter/no_plain_nodes') describe HamlLint::Linter::NoPlainNodes do include_context 'linter' |