Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-17 09:10:12 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-17 09:10:12 +0300
commitc64b892786865a3b87701450c6ca62fcab0fa044 (patch)
tree81193337273f6360b9d0814064454248cf0a7b6a /app/controllers/admin/integrations_controller.rb
parentd17008f99ed08e7c231b7e8e65cba1be51e2e747 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/admin/integrations_controller.rb')
-rw-r--r--app/controllers/admin/integrations_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/integrations_controller.rb b/app/controllers/admin/integrations_controller.rb
index 4f3be43d14d..b2d5a2d130c 100644
--- a/app/controllers/admin/integrations_controller.rb
+++ b/app/controllers/admin/integrations_controller.rb
@@ -12,7 +12,7 @@ class Admin::IntegrationsController < Admin::ApplicationController
end
def integrations_enabled?
- Feature.enabled?(:instance_level_integrations)
+ true
end
def scoped_edit_integration_path(integration)