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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
ceb700b6
Commit
ceb700b6
authored
Mar 12, 2021
by
Alexander Turinske
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert mattermost alert to pajamas
parent
be7b38c4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
app/views/projects/mattermosts/_no_teams.html.haml
app/views/projects/mattermosts/_no_teams.html.haml
+3
-1
changelogs/unreleased/233678-pajamas-mattermost-alert.yml
changelogs/unreleased/233678-pajamas-mattermost-alert.yml
+5
-0
spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb
.../services/user_activates_mattermost_slash_command_spec.rb
+1
-1
No files found.
app/views/projects/mattermosts/_no_teams.html.haml
View file @
ceb700b6
-
if
@teams_error_message
-
if
@teams_error_message
=
content_for
:flash_message
do
=
content_for
:flash_message
do
.alert.alert-danger
=
@teams_error_message
.gl-alert.gl-alert-danger
=
sprite_icon
(
'error'
,
css_class:
'gl-icon gl-alert-icon gl-alert-icon-no-title'
)
.gl-alert-body
=
@teams_error_message
%p
%p
You aren’t a member of any team on the Mattermost instance at
You aren’t a member of any team on the Mattermost instance at
...
...
changelogs/unreleased/233678-pajamas-mattermost-alert.yml
0 → 100644
View file @
ceb700b6
---
title
:
Convert mattermost alert to pajamas
merge_request
:
56556
author
:
type
:
other
spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb
View file @
ceb700b6
...
@@ -113,7 +113,7 @@ RSpec.describe 'Set up Mattermost slash commands', :js do
...
@@ -113,7 +113,7 @@ RSpec.describe 'Set up Mattermost slash commands', :js do
click_link
'Add to Mattermost'
click_link
'Add to Mattermost'
expect
(
page
).
to
have_selector
(
'.alert'
)
expect
(
page
).
to
have_selector
(
'.
gl-
alert'
)
expect
(
page
).
to
have_content
(
'test mattermost error message'
)
expect
(
page
).
to
have_content
(
'test mattermost error message'
)
end
end
...
...
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