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
This commit is contained in:
commit
6ef8d86459
2 changed files with 0 additions and 5 deletions
|
@ -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?
|
||||
|
|
3
qa/qa.rb
3
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.
|
||||
|
|
Loading…
Reference in a new issue