Get rid of config/initializers/2_app.rb and define Gitlab in lib/gitlab.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
parent
5b44097cf7
commit
2afe3a1210
|
@ -1,5 +1,4 @@
|
|||
require_dependency File.expand_path('../../lib/gitlab', __dir__) # Load Gitlab as soon as possible
|
||||
require_dependency File.expand_path('../../lib/settings', __dir__) # Load Settings as soon as possible
|
||||
|
||||
# Default settings
|
||||
Settings['ldap'] ||= Settingslogic.new({})
|
||||
|
|
|
@ -1,9 +0,0 @@
|
|||
require_dependency 'gitlab/popen'
|
||||
|
||||
module Gitlab
|
||||
def self.config
|
||||
Settings
|
||||
end
|
||||
|
||||
REVISION = Gitlab::Popen.popen(%W(#{config.git.bin_path} log --pretty=format:%h -n 1)).first.chomp.freeze
|
||||
end
|
|
@ -1,14 +1,20 @@
|
|||
require_dependency 'gitlab/git'
|
||||
require_dependency 'settings'
|
||||
require_dependency 'gitlab/popen'
|
||||
|
||||
module Gitlab
|
||||
def self.root
|
||||
Pathname.new(File.expand_path('..', __dir__))
|
||||
end
|
||||
|
||||
def self.config
|
||||
Settings
|
||||
end
|
||||
|
||||
COM_URL = 'https://gitlab.com'.freeze
|
||||
APP_DIRS_PATTERN = %r{^/?(app|config|ee|lib|spec|\(\w*\))}
|
||||
SUBDOMAIN_REGEX = %r{\Ahttps://[a-z0-9]+\.gitlab\.com\z}
|
||||
VERSION = File.read(root.join("VERSION")).strip.freeze
|
||||
REVISION = Gitlab::Popen.popen(%W(#{config.git.bin_path} log --pretty=format:%h -n 1)).first.chomp.freeze
|
||||
|
||||
def self.com?
|
||||
# Check `gl_subdomain?` as well to keep parity with gitlab.com
|
||||
|
|
|
@ -1,9 +1,7 @@
|
|||
require 'settingslogic'
|
||||
|
||||
require_dependency 'gitlab'
|
||||
|
||||
class Settings < Settingslogic
|
||||
source ENV.fetch('GITLAB_CONFIG') { Gitlab.root.join('config/gitlab.yml') }
|
||||
source ENV.fetch('GITLAB_CONFIG') { Pathname.new(File.expand_path('..', __dir__)).join('config/gitlab.yml') }
|
||||
namespace ENV.fetch('GITLAB_ENV') { Rails.env }
|
||||
|
||||
class << self
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
require 'bundler/setup'
|
||||
|
||||
ENV['GITLAB_ENV'] = 'test'
|
||||
ENV['RAILS_ENV'] = 'test'
|
||||
ENV['IN_MEMORY_APPLICATION_SETTINGS'] = 'true'
|
||||
|
||||
unless Object.respond_to?(:require_dependency)
|
||||
|
@ -11,9 +10,6 @@ unless Object.respond_to?(:require_dependency)
|
|||
end
|
||||
|
||||
# Defines Gitlab and Gitlab.config which are at the center of the app
|
||||
unless defined?(Gitlab.config)
|
||||
require_relative '../lib/settings'
|
||||
require_relative '../config/initializers/2_app'
|
||||
end
|
||||
require_relative '../lib/gitlab' unless defined?(Gitlab.config)
|
||||
|
||||
require_relative 'support/rspec'
|
||||
|
|
Loading…
Reference in New Issue