diff options
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/mattermost/new.html.haml | 5 | ||||
| -rw-r--r-- | app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/app/views/projects/mattermost/new.html.haml b/app/views/projects/mattermost/new.html.haml index cc05fb1eeb6..02521579df7 100644 --- a/app/views/projects/mattermost/new.html.haml +++ b/app/views/projects/mattermost/new.html.haml @@ -24,10 +24,9 @@ %h4 Team %p Select or create the team where the slash commands will be used in - options = mattermost_teams_options(@teams) - - isOneTeam = options.count === 1 - = f.select(:team_id, options, {}, {class: 'form-control', selected: "#{options.first[1] if isOneTeam}", disabled: isOneTeam}) + = f.select(:team_id, options, {}, {class: 'form-control', selected: "#{options.first[1] if options.count.one?}", disabled: options.count.one?}) .help-block - - if isOneTeam + - if options.count.one? This is the only team where you are an administrator. - else The list shows teams where you are administrator diff --git a/app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml b/app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml index 85fd17ff2ce..11a7bd7d30e 100644 --- a/app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml +++ b/app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml @@ -4,7 +4,7 @@ .col-sm-9= @service.activated? ? 'Installed' : 'Not installed' .row %strong.col-sm-3.text-right Mattermost - = link_to Gitlab.config.mattermost.host, Gitlab.config.mattermost.host, class: 'col-sm-9', target: '__blank' + = link_to Gitlab.config.mattermost.host.gsub(/\A.*?:\/\//, ''), Gitlab.config.mattermost.host, class: 'col-sm-9', target: '__blank' .row %strong.col-sm-3.text-right Installation .col-sm-9 |