kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'mm12935' into 'master'

Browse source 
Remove Content-Type override for Mattermost OAuth login

Closes #46810

See merge request gitlab-org/gitlab-ce!28374
This commit is contained in:
Jan Provaznik 2019-05-17 14:48:27 +00:00
commit bab9a10a4c
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/unreleased/mm12935.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Remove Content-Type override for Mattermost OAuth login
merge_request:
author: Harrison Healey
type: removed

2
lib/mattermost/session.rb
View file

@ -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']