kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'revert-8374dd56' into 'master'

Browse source 
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:
Ash McKenzie 2019-08-05 05:05:48 +00:00
commit 6ef8d86459
2 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/initializers/0_inject_enterprise_edition_module.rb
View file

@ -1,7 +1,5 @@
# 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?

3
qa/qa.rb
View 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.