Commit 6ef8d864 authored by Ash McKenzie's avatar Ash McKenzie

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
parents aa26a013 8ff68917
# frozen_string_literal: true # frozen_string_literal: true
require 'active_support/inflector'
module InjectEnterpriseEditionModule module InjectEnterpriseEditionModule
def prepend_if_ee(constant) def prepend_if_ee(constant)
prepend(constant.constantize) if Gitlab.ee? prepend(constant.constantize) if Gitlab.ee?
......
...@@ -4,9 +4,6 @@ $: << File.expand_path(File.dirname(__FILE__)) ...@@ -4,9 +4,6 @@ $: << File.expand_path(File.dirname(__FILE__))
Encoding.default_external = 'UTF-8' Encoding.default_external = 'UTF-8'
require_relative '../lib/gitlab'
require_relative '../config/initializers/0_inject_enterprise_edition_module'
module QA module QA
## ##
# GitLab QA runtime classes, mostly singletons. # GitLab QA runtime classes, mostly singletons.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment