diff options
Diffstat (limited to 'app/views/projects/services/mattermost_slash_commands')
3 files changed, 6 insertions, 6 deletions
diff --git a/app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml b/app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml index fe983961657..9d8ce186232 100644 --- a/app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml +++ b/app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml @@ -57,7 +57,7 @@ .form-group = label_tag :request_url, s_('MattermostService|Request URL'), class: 'col-12 col-form-label label-bold' .col-12.input-group - = text_field_tag :request_url, service_trigger_url(subject), class: 'form-control form-control-sm', readonly: 'readonly' + = text_field_tag :request_url, service_trigger_url(integration), class: 'form-control form-control-sm', readonly: 'readonly' .input-group-append = clipboard_button(target: '#request_url', class: 'input-group-text') diff --git a/app/views/projects/services/mattermost_slash_commands/_help.html.haml b/app/views/projects/services/mattermost_slash_commands/_help.html.haml index 4a7757daebc..993df389fb0 100644 --- a/app/views/projects/services/mattermost_slash_commands/_help.html.haml +++ b/app/views/projects/services/mattermost_slash_commands/_help.html.haml @@ -10,8 +10,8 @@ %p.inline = s_("MattermostService|After you configure the integration, view your new Mattermost commands by entering") %kbd.inline /<trigger> help - - if !enabled && @service.project_level? - = render 'projects/services/mattermost_slash_commands/detailed_help', subject: @service + - if !enabled && integration.project_level? + = render 'projects/services/mattermost_slash_commands/detailed_help', integration: integration -- if enabled && @service.project_level? - = render 'projects/services/mattermost_slash_commands/installation_info', subject: @service +- if enabled && integration.project_level? + = render 'projects/services/mattermost_slash_commands/installation_info', integration: integration diff --git a/app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml b/app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml index 53ee363de53..38adc69dd5e 100644 --- a/app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml +++ b/app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml @@ -1,5 +1,5 @@ .services-installation-info - - unless @service.activated? + - unless integration.activated? .row .col-sm-9.offset-sm-3 = link_to new_project_mattermost_path(@project), class: 'btn gl-button btn-lg' do |