Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
ef5e13c9
Commit
ef5e13c9
authored
May 29, 2018
by
Harrison Healey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated help text for team list for Mattermost slash commands
parent
f124b6fd
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
app/views/projects/mattermosts/_team_selection.html.haml
app/views/projects/mattermosts/_team_selection.html.haml
+2
-2
changelogs/unreleased/mattermost-api-v4.yml
changelogs/unreleased/mattermost-api-v4.yml
+1
-1
spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb
.../services/user_activates_mattermost_slash_command_spec.rb
+2
-2
No files found.
app/views/projects/mattermosts/_team_selection.html.haml
View file @
ef5e13c9
...
@@ -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
...
...
changelogs/unreleased/mattermost-api-v4.yml
View file @
ef5e13c9
---
---
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
spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb
View file @
ef5e13c9
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment