Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-21 21:08:58 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-21 21:08:58 +0300
commit965e1d8b5a8e642edc0b9abeae66687bcd0ef067 (patch)
treec392c55243ec880db9fff49a87b05249721ce9bd /app/views/projects/mattermosts
parent63324f9cfd863cda2f717835efc933cdd5ade792 (diff)
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.haml2
-rw-r--r--app/views/projects/mattermosts/_team_selection.html.haml4
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 71bd098d0df..00efea81f8f 100644
--- a/app/views/projects/mattermosts/_no_teams.html.haml
+++ b/app/views/projects/mattermosts/_no_teams.html.haml
@@ -9,7 +9,7 @@
To install this service,
= link_to "#{Gitlab.config.mattermost.host}/select_team", target: '__blank' do
join a team
- = icon('external-link')
+ = sprite_icon('external-link')
and try again.
%hr
.clearfix
diff --git a/app/views/projects/mattermosts/_team_selection.html.haml b/app/views/projects/mattermosts/_team_selection.html.haml
index a940b66f7a8..ea04a55a77c 100644
--- a/app/views/projects/mattermosts/_team_selection.html.haml
+++ b/app/views/projects/mattermosts/_team_selection.html.haml
@@ -19,7 +19,7 @@
To create a team,
= link_to "#{Gitlab.config.mattermost.host}/create_team" do
use Mattermost's interface
- = icon('external-link')
+ = sprite_icon('external-link')
or ask your Mattermost system administrator.
%hr
%h4 Command trigger word
@@ -38,7 +38,7 @@
Reserved:
= link_to 'https://docs.mattermost.com/help/messaging/executing-commands.html#built-in-commands', target: '__blank' do
see list of built-in slash commands
- = icon('external-link')
+ = sprite_icon('external-link')
%hr
.clearfix
.float-right