diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-03-06 17:12:49 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-03-06 17:12:49 +0100 |
| commit | 0e5d065848aa3149efcb5248293f265699b5b57c (patch) | |
| tree | 8c9c725befc4847bf963f636a7210ac1fce3778a /app/helpers/mattermost_helper.rb | |
| parent | 46d99dedfbe10dc36c79c6f09d886ad2fc2192b5 (diff) | |
| parent | 348dff0a826c45f00f992e761423a22d2ac32bc3 (diff) | |
| download | gitlab-ce-23993-drop-ci_projects.tar.gz | |
Merge remote-tracking branch 'origin/master' into 23993-drop-ci_projects23993-drop-ci_projects
Diffstat (limited to 'app/helpers/mattermost_helper.rb')
| -rw-r--r-- | app/helpers/mattermost_helper.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/helpers/mattermost_helper.rb b/app/helpers/mattermost_helper.rb index 49ac12db832..27ff4051c8d 100644 --- a/app/helpers/mattermost_helper.rb +++ b/app/helpers/mattermost_helper.rb @@ -1,9 +1,7 @@ module MattermostHelper def mattermost_teams_options(teams) - teams_options = teams.map do |id, options| - [options['display_name'] || options['name'], id] + teams.map do |team| + [team['display_name'] || team['name'], team['id']] end - - teams_options.compact.unshift(['Select team...', '0']) end end |