Automatic merge of gitlab-org/gitlab-ce master

.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:

lib/haml_lint/inline_javascript.rb → 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'

lib/haml_lint/linter/no_plain_nodes.rb → 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)

lib/tasks/haml-lint.rake

 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,

spec/lib/haml_lint/linter/no_plain_nodes_spec.rb → 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'