diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-01-24 17:54:30 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-01-24 17:54:30 +0000 |
| commit | 8bcc911b9bc9fcb2179860c5a98d8a1ad3ec34b0 (patch) | |
| tree | 1dbe4d6688c4591bd4fdd66a92212422048b47ed /app | |
| parent | 85f0229b157a26f4cd954ce5ca20588a9dae29f6 (diff) | |
| download | gitlab-ce-8bcc911b9bc9fcb2179860c5a98d8a1ad3ec34b0.tar.gz | |
Added error message and test
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/mattermosts/_no_teams.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/mattermosts/new.html.haml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/views/projects/mattermosts/_no_teams.html.haml b/app/views/projects/mattermosts/_no_teams.html.haml index 605c7f61dee..1bb3642431e 100644 --- a/app/views/projects/mattermosts/_no_teams.html.haml +++ b/app/views/projects/mattermosts/_no_teams.html.haml @@ -1,3 +1,6 @@ += content_for :flash_message do + .alert.alert-danger= @teams if @teams.is_a?(String) + %p You aren’t a member of any team on the Mattermost instance at %strong= Gitlab.config.mattermost.host diff --git a/app/views/projects/mattermosts/new.html.haml b/app/views/projects/mattermosts/new.html.haml index 96b1d2aee61..82f596da0fe 100644 --- a/app/views/projects/mattermosts/new.html.haml +++ b/app/views/projects/mattermosts/new.html.haml @@ -2,7 +2,7 @@ .inline.pull-right = custom_icon('mattermost_logo', size: 48) %h3 Install Mattermost Command - - if @teams.empty? + - if @teams.is_a?(String) || @teams.empty? = render 'no_teams' - else = render 'team_selection' |