Add latest changes from gitlab-org/gitlab@master

2 files changed, 23 insertions, 25 deletions

diff --git a/haml_lint/inline_javascript.rb b/haml_lint/inline_javascript.rb
deleted file mode 100644
index c87d77d7a4b..00000000000
--- a/haml_lint/inline_javascript.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-unless Rails.env.production?
-  require 'haml_lint/haml_visitor'
-  require 'haml_lint/linter'
-  require 'haml_lint/linter_registry'
-
-  module HamlLint
-    class Linter::InlineJavaScript < Linter
-      include ::HamlLint::LinterRegistry
-
-      def visit_filter(node)
-        return unless node.filter_type == 'javascript'
-
-        record_lint(node, 'Inline JavaScript is discouraged (https://docs.gitlab.com/ee/development/gotchas.html#do-not-use-inline-javascript-in-views)')
-      end
-
-      def visit_tag(node)
-        return unless node.tag_name == 'script'
-
-        record_lint(node, 'Inline JavaScript is discouraged (https://docs.gitlab.com/ee/development/gotchas.html#do-not-use-inline-javascript-in-views)')
-      end
-    end
-  end
-end
diff --git a/haml_lint/linter/inline_javascript.rb b/haml_lint/linter/inline_javascript.rb
new file mode 100644
index 00000000000..f7672c98347
--- /dev/null
+++ b/haml_lint/linter/inline_javascript.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module HamlLint
+  class Linter
+    class InlineJavaScript < Linter
+      include ::HamlLint::LinterRegistry
+
+      MSG = 'Inline JavaScript is discouraged (https://docs.gitlab.com/ee/development/gotchas.html#do-not-use-inline-javascript-in-views)'
+
+      def visit_filter(node)
+        return unless node.filter_type == 'javascript'
+
+        record_lint(node, MSG)
+      end
+
+      def visit_tag(node)
+        return unless node.tag_name == 'script'
+
+        record_lint(node, MSG)
+      end
+    end
+  end
+end