diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-06-05 11:55:32 +0100 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-06-05 11:55:32 +0100 |
| commit | 3f9cdb9c9822f176ebe4ce8aa34a84e06bae60f0 (patch) | |
| tree | 8b029adbe769e0c082f2e83ba831ba065648dbb4 /lib/mattermost/session.rb | |
| parent | 7e36fa398b6f2e0304d852b7c77ef30d83e62ed4 (diff) | |
| parent | 7eb2f184e6a74c84a58ba07d78d2bcaab764a42d (diff) | |
| download | gitlab-ce-3f9cdb9c9822f176ebe4ce8aa34a84e06bae60f0.tar.gz | |
Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redesign-with-draggable-labels
Diffstat (limited to 'lib/mattermost/session.rb')
| -rw-r--r-- | lib/mattermost/session.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mattermost/session.rb b/lib/mattermost/session.rb index 85f78e44f32..2aa7a2f64d8 100644 --- a/lib/mattermost/session.rb +++ b/lib/mattermost/session.rb @@ -112,7 +112,7 @@ module Mattermost end def destroy - post('/api/v3/users/logout') + post('/api/v4/users/logout') end def oauth_uri @@ -120,7 +120,7 @@ module Mattermost @oauth_uri = nil - response = get("/api/v3/oauth/gitlab/login", follow_redirects: false) + response = get('/oauth/gitlab/login', follow_redirects: false, format: 'text/html') return unless (300...400) === response.code redirect_uri = response.headers['location'] |