diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2018-05-29 18:56:56 +0300 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2018-05-29 18:56:56 +0300 |
commit | ef5e13c946446441d767e9aa3834afff29277f96 (patch) | |
tree | e004092a08bf3aebf8a4b725a512ce77e5712910 | |
parent | f124b6fd11a40d4538c64b5734e08727cba24305 (diff) |
Updated help text for team list for Mattermost slash commands
3 files changed, 5 insertions, 5 deletions
diff --git a/app/views/projects/mattermosts/_team_selection.html.haml b/app/views/projects/mattermosts/_team_selection.html.haml index 361d3c61d99..37c09f12f63 100644 --- a/app/views/projects/mattermosts/_team_selection.html.haml +++ b/app/views/projects/mattermosts/_team_selection.html.haml @@ -13,9 +13,9 @@ = f.hidden_field(:team_id, value: selected_id, required: true) if @teams.one? .form-text.text-muted - if @teams.one? - This is the only available team. + This is the only available team that you are a member of. - else - The list shows all available teams. + The list shows all available teams that you are a member of. To create a team, = link_to "#{Gitlab.config.mattermost.host}/create_team" do use Mattermost's interface diff --git a/changelogs/unreleased/mattermost-api-v4.yml b/changelogs/unreleased/mattermost-api-v4.yml index 9a2dff222e7..8c5033f2a0c 100644 --- a/changelogs/unreleased/mattermost-api-v4.yml +++ b/changelogs/unreleased/mattermost-api-v4.yml @@ -1,5 +1,5 @@ --- -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 author: Harrison Healey type: changed diff --git a/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb b/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb index b2906e315f7..fce41ce347f 100644 --- a/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb +++ b/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb @@ -64,7 +64,7 @@ feature 'Setup Mattermost slash commands', :js do 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('This is the only available team.') + expect(page).to have_content('This is the only available team that you are a member of.') end 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 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('The list shows all available teams.') + expect(page).to have_content('The list shows all available teams that you are a member of.') end it 'shows a select with team options user is a member of multiple teams' do |