Address latest feedback
Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
parent
c286c66f57
commit
5b44097cf7
|
@ -5,6 +5,5 @@ module Gitlab
|
|||
Settings
|
||||
end
|
||||
|
||||
VERSION = File.read(Gitlab.root.join("VERSION")).strip.freeze
|
||||
REVISION = Gitlab::Popen.popen(%W(#{config.git.bin_path} log --pretty=format:%h -n 1)).first.chomp.freeze
|
||||
end
|
||||
|
|
|
@ -100,7 +100,7 @@ really fast since:
|
|||
|
||||
- Gems loading is skipped
|
||||
- Rails app boot is skipped
|
||||
- Gitlab::Shell and Gitaly setup are skipped
|
||||
- gitlab-shell and Gitaly setup are skipped
|
||||
- Test repositories setup are skipped
|
||||
|
||||
Note that in some cases, you might have to add some `require_dependency 'foo'`
|
||||
|
|
|
@ -1,14 +1,15 @@
|
|||
require_dependency 'gitlab/git'
|
||||
|
||||
module Gitlab
|
||||
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}
|
||||
|
||||
def self.root
|
||||
Pathname.new(File.expand_path('..', __dir__))
|
||||
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
|
||||
|
||||
def self.com?
|
||||
# Check `gl_subdomain?` as well to keep parity with gitlab.com
|
||||
Gitlab.config.gitlab.url == COM_URL || gl_subdomain?
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
require 'settingslogic'
|
||||
|
||||
require_dependency 'gitlab'
|
||||
|
||||
class Settings < Settingslogic
|
||||
|
|
|
@ -1,19 +1,17 @@
|
|||
require 'bundler/setup'
|
||||
|
||||
require 'settingslogic'
|
||||
|
||||
ENV['GITLAB_ENV'] = 'test'
|
||||
ENV['RAILS_ENV'] = 'test'
|
||||
ENV['IN_MEMORY_APPLICATION_SETTINGS'] = 'true'
|
||||
|
||||
unless Kernel.respond_to?(:require_dependency)
|
||||
module Kernel
|
||||
unless Object.respond_to?(:require_dependency)
|
||||
class Object
|
||||
alias_method :require_dependency, :require
|
||||
end
|
||||
end
|
||||
|
||||
# Defines Gitlab and Gitlab.config which are at the center of the app
|
||||
unless defined?(Gitlab) && Gitlab.respond_to?(:config)
|
||||
unless defined?(Gitlab.config)
|
||||
require_relative '../lib/settings'
|
||||
require_relative '../config/initializers/2_app'
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue