Automatic merge of gitlab-org/gitlab-ce master

changelogs/unreleased/mm12935.yml

+---
+title: Remove Content-Type override for Mattermost OAuth login
+merge_request:
+author: Harrison Healey
+type: removed

lib/gitlab/path_regex.rb

@@ -58,6 +58,7 @@ module Gitlab
       uploads
       users
       v2
+      visual-review-toolbar.js
     ].freeze
 
     # This list should contain all words following `/*namespace_id/:project_id` in

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