From 8ff68917b8b78dbf34785bda370692ac8b97c414 Mon Sep 17 00:00:00 2001 From: Mark Lapierre Date: Mon, 5 Aug 2019 04:02:08 +0000 Subject: Revert "Merge branch 'backport-fix-remaining-prepend-lines' into 'master'" This reverts merge request !31379 --- config/initializers/0_inject_enterprise_edition_module.rb | 2 -- qa/qa.rb | 3 --- 2 files changed, 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? diff --git a/qa/qa.rb b/qa/qa.rb index 8be2a289422..18fb4509dce 100644 --- a/qa/qa.rb +++ b/qa/qa.rb @@ -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. -- cgit v1.2.1