summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2019-05-14 14:38:32 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2019-05-16 13:57:55 -0400
commit61ea0e1a940107d342bc1cd07ba5b8bc0057b907 (patch)
tree4dce4c5c877701bb965fab8343a6bcf40d9e8402
parent0c63ad850af1fe19eeae5778f984030d28617dda (diff)
downloadgitlab-ce-61ea0e1a940107d342bc1cd07ba5b8bc0057b907.tar.gz
Remove Content-Type override for Mattermost OAuth login
-rw-r--r--changelogs/unreleased/mm12935.yml5
-rw-r--r--lib/mattermost/session.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/mm12935.yml b/changelogs/unreleased/mm12935.yml
new file mode 100644
index 00000000000..782586c514e
--- /dev/null
+++ b/changelogs/unreleased/mm12935.yml
@@ -0,0 +1,5 @@
+---
+title: Remove Content-Type override for Mattermost OAuth login
+merge_request:
+author: Harrison Healey
+type: removed
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']