Commit bf3d1900 authored by Mario de la Ossa's avatar Mario de la Ossa

Backport of gitlab-org/gitlab-ee!6876

parent e4e172a2
Pipeline #28315336 passed with stages
in 39 minutes and 39 seconds
......@@ -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
......
# 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
......@@ -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"
......
......@@ -40,6 +40,7 @@ module Gitlab
invites
jwt
koding
login
notification_settings
oauth
profile
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment