Commit ef5e13c9 authored by Harrison Healey's avatar Harrison Healey

Updated help text for team list for Mattermost slash commands

parent f124b6fd
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
= f.hidden_field(:team_id, value: selected_id, required: true) if @teams.one? = f.hidden_field(:team_id, value: selected_id, required: true) if @teams.one?
.form-text.text-muted .form-text.text-muted
- if @teams.one? - if @teams.one?
This is the only available team. This is the only available team that you are a member of.
- else - else
The list shows all available teams. The list shows all available teams that you are a member of.
To create a team, To create a team,
= link_to "#{Gitlab.config.mattermost.host}/create_team" do = link_to "#{Gitlab.config.mattermost.host}/create_team" do
use Mattermost's interface use Mattermost's interface
......
--- ---
title: Updated Mattermost integration to use API v4 title: Updated Mattermost integration to use API v4 and only allow creation of Mattermost slash commands in the current user's teams
merge_request: 19043 merge_request: 19043
author: Harrison Healey author: Harrison Healey
type: changed type: changed
...@@ -64,7 +64,7 @@ feature 'Setup Mattermost slash commands', :js do ...@@ -64,7 +64,7 @@ feature 'Setup Mattermost slash commands', :js do
click_link 'Add to Mattermost' click_link 'Add to Mattermost'
expect(page).to have_content('The team where the slash commands will be used in') expect(page).to have_content('The team where the slash commands will be used in')
expect(page).to have_content('This is the only available team.') expect(page).to have_content('This is the only available team that you are a member of.')
end end
it 'shows a disabled prefilled select if user is a member of 1 team' do it 'shows a disabled prefilled select if user is a member of 1 team' do
...@@ -94,7 +94,7 @@ feature 'Setup Mattermost slash commands', :js do ...@@ -94,7 +94,7 @@ feature 'Setup Mattermost slash commands', :js do
click_link 'Add to Mattermost' click_link 'Add to Mattermost'
expect(page).to have_content('Select the team where the slash commands will be used in') expect(page).to have_content('Select the team where the slash commands will be used in')
expect(page).to have_content('The list shows all available teams.') expect(page).to have_content('The list shows all available teams that you are a member of.')
end end
it 'shows a select with team options user is a member of multiple teams' do it 'shows a select with team options user is a member of multiple teams' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment