diff options
author | Ash McKenzie <amckenzie@gitlab.com> | 2019-08-05 05:05:48 +0000 |
---|---|---|
committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-08-05 05:05:48 +0000 |
commit | 6ef8d86459fa348b34d1430db7e4cc229f888646 (patch) | |
tree | ad5dc52e0c5943babf8a3923e1d60f2a048565a6 | |
parent | aa26a013480337d1ad1e87fe87e7f9500a48abdd (diff) | |
parent | 8ff68917b8b78dbf34785bda370692ac8b97c414 (diff) | |
download | gitlab-ce-6ef8d86459fa348b34d1430db7e4cc229f888646.tar.gz |
Merge branch 'revert-8374dd56' into 'master'
Revert "Merge branch 'backport-fix-remaining-prepend-lines' into 'master'"
Closes #65607
See merge request gitlab-org/gitlab-ce!31456
-rw-r--r-- | config/initializers/0_inject_enterprise_edition_module.rb | 2 | ||||
-rw-r--r-- | qa/qa.rb | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/config/initializers/0_inject_enterprise_edition_module.rb b/config/initializers/0_inject_enterprise_edition_module.rb index 39595e23abe..4b21732e179 100644 --- a/config/initializers/0_inject_enterprise_edition_module.rb +++ b/config/initializers/0_inject_enterprise_edition_module.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'active_support/inflector' - module InjectEnterpriseEditionModule def prepend_if_ee(constant) prepend(constant.constantize) if Gitlab.ee? @@ -4,9 +4,6 @@ $: << File.expand_path(File.dirname(__FILE__)) Encoding.default_external = 'UTF-8' -require_relative '../lib/gitlab' -require_relative '../config/initializers/0_inject_enterprise_edition_module' - module QA ## # GitLab QA runtime classes, mostly singletons. |