Commit 867c35da authored by Rémy Coutable's avatar Rémy Coutable

Move all EE-specific lib/ files to ee/lib/

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent bea46788
...@@ -8,7 +8,7 @@ require 'active_support' ...@@ -8,7 +8,7 @@ require 'active_support'
require 'active_support/core_ext' require 'active_support/core_ext'
require 'benchmark' require 'benchmark'
$: << File.expand_path('../lib', File.dirname(__FILE__)) $: << File.expand_path('../ee/lib', __dir__)
require 'linguist' require 'linguist'
require 'open3' require 'open3'
...@@ -24,7 +24,7 @@ require 'elasticsearch/git/repository' ...@@ -24,7 +24,7 @@ require 'elasticsearch/git/repository'
Thread.abort_on_exception = true 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) LOGGER = Logger.new(path_to_log_file)
PROJECT_ID = ARGV.shift PROJECT_ID = ARGV.shift
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
require 'optparse' require 'optparse'
require_relative '../lib/gitlab/sidekiq_config' require_relative '../lib/gitlab/sidekiq_config'
require_relative '../lib/gitlab/sidekiq_cluster' require_relative '../ee/lib/gitlab/sidekiq_cluster'
require_relative '../lib/gitlab/sidekiq_cluster/cli' require_relative '../ee/lib/gitlab/sidekiq_cluster/cli'
Thread.abort_on_exception = true Thread.abort_on_exception = true
......
...@@ -6,7 +6,7 @@ class PushRule < ActiveRecord::Base ...@@ -6,7 +6,7 @@ class PushRule < ActiveRecord::Base
validates :project, presence: true, unless: "is_sample?" validates :project, presence: true, unless: "is_sample?"
validates :max_file_size, numericality: { greater_than_or_equal_to: 0, only_integer: true } 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[ SETTINGS_WITH_GLOBAL_DEFAULT = %i[
reject_unsigned_commits reject_unsigned_commits
commit_committer_check commit_committer_check
......
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