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:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2016-11-19 23:56:25 +0300
committerZ.J. van de Weg <git@zjvandeweg.nl>2016-11-21 15:43:37 +0300
commite74e53ae98bd7656eb84e907e25f2ad0b70afde9 (patch)
treefa0ad75c7166360899257d82af0c24c5bd574d34 /app/views/projects/services
parent8e5ad7c01a3617f57d4750d0be8d8d7405e70137 (diff)
Pass @service using subject
Diffstat (limited to 'app/views/projects/services')
-rw-r--r--app/views/projects/services/_form.html.haml2
-rw-r--r--app/views/projects/services/mattermost_command/_help.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index 8ada4c4b962..db51c4f8a4e 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -7,7 +7,7 @@
%p= @service.description
.col-lg-9
= form_for(@service, as: :service, url: namespace_project_service_path(@project.namespace, @project, @service.to_param), method: :put, html: { class: 'form-horizontal' }) do |form|
- = render 'shared/service_settings', form: form
+ = render 'shared/service_settings', form: form, subject: @service
.footer-block.row-content-block
= form.submit 'Save changes', class: 'btn btn-save'
diff --git a/app/views/projects/services/mattermost_command/_help.html.haml b/app/views/projects/services/mattermost_command/_help.html.haml
index b3386103e7c..c6e0e883752 100644
--- a/app/views/projects/services/mattermost_command/_help.html.haml
+++ b/app/views/projects/services/mattermost_command/_help.html.haml
@@ -51,7 +51,7 @@
.form-group
= label_tag :request_url, 'Request URL', class: 'col-sm-2 col-xs-12 control-label'
.col-sm-10.col-xs-12.input-group
- = text_field_tag :request_url, service_trigger_url(@service), class: 'form-control input-sm', readonly: 'readonly'
+ = text_field_tag :request_url, service_trigger_url(subject), class: 'form-control input-sm', readonly: 'readonly'
.input-group-btn
= clipboard_button(clipboard_target: '#request_url')