Merge branch '3971-migrate-ee-specific-lib-files' into 'master'

Resolve "Move EE-only /lib files under top-level /ee directory"

Closes #3971

See merge request gitlab-org/gitlab-ee!4282

bin/elastic_repo_indexer

@@ -8,7 +8,7 @@ require 'active_support'
 require 'active_support/core_ext'
 require 'benchmark'
 
-$: << File.expand_path('../lib', File.dirname(__FILE__))
+$: << File.expand_path('../ee/lib', __dir__)
 
 require 'linguist'
 require 'open3'
@@ -24,7 +24,7 @@ require 'elasticsearch/git/repository'
 
 Thread.abort_on_exception = true
 
-path_to_log_file = File.expand_path('../log/es-indexer.log', File.dirname(__FILE__))
+path_to_log_file = File.expand_path('../log/es-indexer.log', __dir__)
 LOGGER = Logger.new(path_to_log_file)
 
 PROJECT_ID = ARGV.shift

bin/sidekiq-cluster

@@ -2,8 +2,8 @@
 
 require 'optparse'
 require_relative '../lib/gitlab/sidekiq_config'
-require_relative '../lib/gitlab/sidekiq_cluster'
-require_relative '../lib/gitlab/sidekiq_cluster/cli'
+require_relative '../ee/lib/gitlab/sidekiq_cluster'
+require_relative '../ee/lib/gitlab/sidekiq_cluster/cli'
 
 Thread.abort_on_exception = true
 

ee/app/models/push_rule.rb

@@ -6,7 +6,7 @@ class PushRule < ActiveRecord::Base
   validates :project, presence: true, unless: "is_sample?"
   validates :max_file_size, numericality: { greater_than_or_equal_to: 0, only_integer: true }
 
-  FILES_BLACKLIST = YAML.load_file(Rails.root.join('lib/gitlab/checks/files_blacklist.yml'))
+  FILES_BLACKLIST = YAML.load_file(Rails.root.join('ee/lib/gitlab/checks/files_blacklist.yml'))
   SETTINGS_WITH_GLOBAL_DEFAULT = %i[
     reject_unsigned_commits
     commit_committer_check