summaryrefslogtreecommitdiff
path: root/app/views/projects
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-01 09:14:26 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-01 09:14:26 +0000
commit7c9f5b5d627c9eb1a9791613a531122db9a1f81d (patch)
tree446a06f425a458f09a0f2d0ecbb36260583bf8e1 /app/views/projects
parent07630a5decb307e30cbbd13ea7b060d25d772757 (diff)
downloadgitlab-ce-7c9f5b5d627c9eb1a9791613a531122db9a1f81d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
-rw-r--r--app/views/projects/mattermosts/_team_selection.html.haml7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/mattermosts/_team_selection.html.haml b/app/views/projects/mattermosts/_team_selection.html.haml
index 98221125443..397f96d6846 100644
--- a/app/views/projects/mattermosts/_team_selection.html.haml
+++ b/app/views/projects/mattermosts/_team_selection.html.haml
@@ -2,7 +2,7 @@
This service will be installed on the Mattermost instance at
%strong= link_to Gitlab.config.mattermost.host, Gitlab.config.mattermost.host
%hr
-= form_for(:mattermost, method: :post, url: project_mattermost_path(@project), html: { class: 'js-requires-input' }) do |f|
+= gitlab_ui_form_for(:mattermost, method: :post, url: project_mattermost_path(@project), html: { class: 'js-requires-input' }) do |f|
%h4 Team
%p
= @teams.one? ? 'The team' : 'Select the team'
@@ -42,5 +42,6 @@
%hr
.clearfix
.float-right
- = link_to _('Cancel'), edit_project_settings_integration_path(@project, @integration), class: 'gl-button btn btn-lg'
- = f.submit 'Install', class: 'gl-button btn btn-confirm btn-lg'
+ = render Pajamas::ButtonComponent.new(href: edit_project_settings_integration_path(@project, @integration)) do
+ = _('Cancel')
+ = f.submit s_('MattermostService|Install'), pajamas_button: true