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-09-15 21:09:43 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-15 21:09:43 +0300
commitf784f7d3b19fe80834240bde23d1300accb01118 (patch)
tree2acd4a74cbcde10c5b70c356b146af78362862d1 /app/helpers/services_helper.rb
parent06c127aa72cff78235426341081837cff0b6f78b (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/services_helper.rb')
-rw-r--r--app/helpers/services_helper.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/services_helper.rb b/app/helpers/services_helper.rb
index a62428cf602..6b5de73a831 100644
--- a/app/helpers/services_helper.rb
+++ b/app/helpers/services_helper.rb
@@ -96,7 +96,11 @@ module ServicesHelper
trigger_events: trigger_events_for_service(integration),
fields: fields_for_service(integration),
inherit_from_id: integration.inherit_from_id,
- integration_level: integration_level(integration)
+ integration_level: integration_level(integration),
+ editable: integration.editable?.to_s,
+ cancel_path: scoped_integrations_path,
+ can_test: integration.can_test?.to_s,
+ test_path: scoped_test_integration_path(integration)
}
end