diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-13 18:08:57 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-13 18:08:57 +0000 |
| commit | e9606d7f51144274f9a390c9dd683200daab8eed (patch) | |
| tree | b87cf29dc2fb63ea6ed519dabb3f46b06981c737 /app/views/projects/mattermosts | |
| parent | e1189e4c3b8bd5535104f458f5af7505789eac00 (diff) | |
| download | gitlab-ce-e9606d7f51144274f9a390c9dd683200daab8eed.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/mattermosts')
| -rw-r--r-- | app/views/projects/mattermosts/_no_teams.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/mattermosts/_team_selection.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/mattermosts/_no_teams.html.haml b/app/views/projects/mattermosts/_no_teams.html.haml index f375222e311..adef11f315a 100644 --- a/app/views/projects/mattermosts/_no_teams.html.haml +++ b/app/views/projects/mattermosts/_no_teams.html.haml @@ -15,4 +15,4 @@ and try again. %hr .clearfix - = link_to 'Go back', edit_project_service_path(@project, @service), class: 'gl-button btn btn-lg float-right' + = link_to 'Go back', edit_project_service_path(@project, @integration), class: 'gl-button btn btn-lg float-right' diff --git a/app/views/projects/mattermosts/_team_selection.html.haml b/app/views/projects/mattermosts/_team_selection.html.haml index ea04a55a77c..4109fdfc13b 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| += 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,5 @@ %hr .clearfix .float-right - = link_to 'Cancel', edit_project_service_path(@project, @service), class: 'gl-button btn btn-lg' + = link_to 'Cancel', edit_project_service_path(@project, @integration), class: 'gl-button btn btn-lg' = f.submit 'Install', class: 'gl-button btn btn-success btn-lg' |