diff options
author | Robert Speicher <robert@gitlab.com> | 2018-10-18 15:10:50 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-10-18 15:10:50 +0000 |
commit | dfee19c42a26a49ce45a2a7207fcec46c2c19002 (patch) | |
tree | 54b60548bcd5c66659a5a2ce8afd914b17b9ffec /lib | |
parent | c4d5d8cb64b52a1cdbc3861478e5b30a1e7199f4 (diff) | |
parent | 6683aa8b1073eb56c99343dafab11b2e65375a04 (diff) | |
download | gitlab-ce-dfee19c42a26a49ce45a2a7207fcec46c2c19002.tar.gz |
Merge branch 'bw-fix-hamllint' into 'master'
Multiple spring rake commands cause "NameError: uninitialized constant HamlLint::Linter"
Closes #52843
See merge request gitlab-org/gitlab-ce!22437
Diffstat (limited to 'lib')
-rw-r--r-- | lib/haml_lint/inline_javascript.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/haml_lint/inline_javascript.rb b/lib/haml_lint/inline_javascript.rb index 5ecd6169ecf..2e98227a05e 100644 --- a/lib/haml_lint/inline_javascript.rb +++ b/lib/haml_lint/inline_javascript.rb @@ -2,9 +2,9 @@ # frozen_string_literal: true unless Rails.env.production? - require 'haml_lint/haml_visitor' - require 'haml_lint/linter' - require 'haml_lint/linter_registry' + require_dependency 'haml_lint/haml_visitor' + require_dependency 'haml_lint/linter' + require_dependency 'haml_lint/linter_registry' module HamlLint class Linter::InlineJavaScript < Linter |