summaryrefslogtreecommitdiff
path: root/lib/gitlab/gitaly_client.rb
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-07-06 14:45:29 +0200
committerJacob Vosmaer <jacob@gitlab.com>2017-07-07 12:48:34 +0200
commit78089d1153ce9a2e3d32cbcaafb8f9757c56a9d4 (patch)
treef0f57d7fea851bf85b4c14449161ef38ffd8a00c /lib/gitlab/gitaly_client.rb
parentf63ca524c9d80107d2328e3d8175d04aad9b4b8a (diff)
downloadgitlab-ce-78089d1153ce9a2e3d32cbcaafb8f9757c56a9d4.tar.gz
Remove option to disable Gitaly completely
Diffstat (limited to 'lib/gitlab/gitaly_client.rb')
-rw-r--r--lib/gitlab/gitaly_client.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index f605c06dfc3..197a94487eb 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -70,12 +70,8 @@ module Gitlab
params['gitaly_token'].presence || Gitlab.config.gitaly['token']
end
- def self.enabled?
- Gitlab.config.gitaly.enabled
- end
-
def self.feature_enabled?(feature, status: MigrationStatus::OPT_IN)
- return false if !enabled? || status == MigrationStatus::DISABLED
+ return false if status == MigrationStatus::DISABLED
feature = Feature.get("gitaly_#{feature}")