diff options
author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2017-03-06 14:04:14 +0000 |
---|---|---|
committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2017-03-06 14:04:14 +0000 |
commit | 77d0de9102e8956f805cd7c52a48684d0b621dc7 (patch) | |
tree | 9404860b1959caffaf8f2539a18853547b30e1a5 /lib/mattermost | |
parent | 597639c09662b5f43ff966938c5e55e485a1563c (diff) | |
parent | 348dff0a826c45f00f992e761423a22d2ac32bc3 (diff) | |
download | gitlab-ce-77d0de9102e8956f805cd7c52a48684d0b621dc7.tar.gz |
Merge branch 'master' into 'zj-create-mattermost-team'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'lib/mattermost')
-rw-r--r-- | lib/mattermost/team.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mattermost/team.rb b/lib/mattermost/team.rb index 69b0a3edf6f..2cdbbdece16 100644 --- a/lib/mattermost/team.rb +++ b/lib/mattermost/team.rb @@ -2,7 +2,7 @@ module Mattermost class Team < Client # Returns **all** teams for an admin def all - session_get('/api/v3/teams/all') + session_get('/api/v3/teams/all').values end # Creates a team on the linked Mattermost instance, the team admin will be the |