summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2018-01-24 16:35:31 +0800
committerLin Jen-Shin <godfat@godfat.org>2018-01-26 19:42:48 +0800
commit99784d77978e7548f70fa8499c5c9931c507d6f4 (patch)
tree6ebb43937b12ae26a0d871cad1ba138196f7e101
parent1f4c40650b8d587b4ab6dd749fd0c6b6c92dcb49 (diff)
downloadgitlab-ce-99784d77978e7548f70fa8499c5c9931c507d6f4.tar.gz
We need Rails in order to use Gitlab.config anyway
-rwxr-xr-xbin/upgrade.rb2
-rw-r--r--lib/gitlab/upgrader.rb3
2 files changed, 1 insertions, 4 deletions
diff --git a/bin/upgrade.rb b/bin/upgrade.rb
index a5caecf8526..ed628fa1d42 100755
--- a/bin/upgrade.rb
+++ b/bin/upgrade.rb
@@ -1,3 +1,3 @@
-require_relative "../lib/gitlab/upgrader"
+require_relative '../config/environment'
Gitlab::Upgrader.new.execute
diff --git a/lib/gitlab/upgrader.rb b/lib/gitlab/upgrader.rb
index 3b64cb32afa..d545f2f95f1 100644
--- a/lib/gitlab/upgrader.rb
+++ b/lib/gitlab/upgrader.rb
@@ -1,6 +1,3 @@
-require_relative "popen"
-require_relative "version_info"
-
module Gitlab
class Upgrader
def execute