diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2019-05-17 17:48:27 +0300 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2019-05-17 17:48:27 +0300 |
| commit | bab9a10a4c3432eb0abd128f0ebec067d1f614de (patch) | |
| tree | 6f6839e7446c1c6d6dfe24c559c1716b35e50278 /lib | |
| parent | 941f37e9939e21b8a7b669f71be4b0422e673dba (diff) | |
| parent | 61ea0e1a940107d342bc1cd07ba5b8bc0057b907 (diff) | |
Merge branch 'mm12935' into 'master'
Remove Content-Type override for Mattermost OAuth login
Closes #46810
See merge request gitlab-org/gitlab-ce!28374
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mattermost/session.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mattermost/session.rb b/lib/mattermost/session.rb index e2083848a8d..722e3e04d1c 100644 --- a/lib/mattermost/session.rb +++ b/lib/mattermost/session.rb @@ -122,7 +122,7 @@ module Mattermost @oauth_uri = nil - response = get('/oauth/gitlab/login', follow_redirects: false, format: 'text/html') + response = get('/oauth/gitlab/login', follow_redirects: false) return unless (300...400) === response.code redirect_uri = response.headers['location'] |