From 5b44097cf7a20a6bcdc38ac9ed43aac0ec33415e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 23 Apr 2018 13:02:07 +0200
Subject: [PATCH] Address latest feedback
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 config/initializers/2_app.rb                    | 1 -
 doc/development/testing_guide/best_practices.md | 2 +-
 lib/gitlab.rb                                   | 9 +++++----
 lib/settings.rb                                 | 2 ++
 spec/fast_spec_helper.rb                        | 8 +++-----
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/config/initializers/2_app.rb b/config/initializers/2_app.rb
index 9d43239f7d3..a560e9d0471 100644
--- a/config/initializers/2_app.rb
+++ b/config/initializers/2_app.rb
@@ -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
diff --git a/doc/development/testing_guide/best_practices.md b/doc/development/testing_guide/best_practices.md
index bf5144d6d1a..b77e9b7ff63 100644
--- a/doc/development/testing_guide/best_practices.md
+++ b/doc/development/testing_guide/best_practices.md
@@ -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'`
diff --git a/lib/gitlab.rb b/lib/gitlab.rb
index a51ea0afbd9..7aff4e590bf 100644
--- a/lib/gitlab.rb
+++ b/lib/gitlab.rb
@@ -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?
diff --git a/lib/settings.rb b/lib/settings.rb
index bc688eaf121..8bf087c76c3 100644
--- a/lib/settings.rb
+++ b/lib/settings.rb
@@ -1,3 +1,5 @@
+require 'settingslogic'
+
 require_dependency 'gitlab'
 
 class Settings < Settingslogic
diff --git a/spec/fast_spec_helper.rb b/spec/fast_spec_helper.rb
index b3fe76fb150..105f70246c9 100644
--- a/spec/fast_spec_helper.rb
+++ b/spec/fast_spec_helper.rb
@@ -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