Merge branch 'ce-6752-jira-branches' into 'master'

Backport of gitlab-org/gitlab-ee!6876

See merge request gitlab-org/gitlab-ce!21266

config/routes.rb

@@ -27,6 +27,13 @@ Rails.application.routes.draw do
                 authorizations: 'oauth/authorizations'
   end
 
+  # This is here so we can "reserve" the path for the Jira integration in GitLab EE
+  # Having a non-existent controller here does not affect the scope in any way since all possible routes
+  # get a 404 proc returned. It is written in this way to minimize merge conflicts with EE
+  scope path: '/login/oauth', controller: 'oauth/jira/authorizations', as: :oauth_jira do
+    match ':action', via: [:get, :post], to: proc { [404, {}, ['']] }
+  end
+
   use_doorkeeper_openid_connect
 
   # Autocomplete

db/post_migrate/20180816193530_rename_login_root_namespaces.rb

+# frozen_string_literal: true
+class RenameLoginRootNamespaces < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+  include Gitlab::Database::RenameReservedPathsMigration::V1
+
+  DOWNTIME = false
+
+  # We're taking over the /login namespace as part of a fix for the Jira integration
+  def up
+    rename_root_paths 'login'
+  end
+
+  def down
+    revert_renames
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180809195358) do
+ActiveRecord::Schema.define(version: 20180816193530) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

lib/gitlab/path_regex.rb

@@ -40,6 +40,7 @@ module Gitlab
       invites
       jwt
       koding
+      login
       notification_settings
       oauth
       profile