diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-05-30 11:58:53 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-05-30 11:58:53 +0300 |
| commit | b2d8d161a060f9e257845ae5813395761132cb13 (patch) | |
| tree | e24c7ed30cfd63890422297557245abc1dae5161 /app | |
| parent | 63d7408125ddbe366bfe468fa4a2f9637acf930b (diff) | |
| parent | ef5e13c946446441d767e9aa3834afff29277f96 (diff) | |
Merge branch 'mattermost-api-v4' into 'master'
Updated Mattermost integration to use Mattermost API v4
Closes #41631
See merge request gitlab-org/gitlab-ce!19043
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/mattermosts/_team_selection.html.haml | 4 |
1 files changed, 2 insertions, 2 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 |