Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
bf3d1900
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
bf3d1900
编写于
8月 16, 2018
作者:
M
Mario de la Ossa
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Backport of gitlab-org/gitlab-ee!6876
上级
e4e172a2
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
25 addition
and
1 deletion
+25
-1
config/routes.rb
config/routes.rb
+7
-0
db/post_migrate/20180816193530_rename_login_root_namespaces.rb
...st_migrate/20180816193530_rename_login_root_namespaces.rb
+16
-0
db/schema.rb
db/schema.rb
+1
-1
lib/gitlab/path_regex.rb
lib/gitlab/path_regex.rb
+1
-0
未找到文件。
config/routes.rb
浏览文件 @
bf3d1900
...
...
@@ -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
0 → 100644
浏览文件 @
bf3d1900
# 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
浏览文件 @
bf3d1900
...
...
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
201808
09195358
)
do
ActiveRecord
::
Schema
.
define
(
version:
201808
16193530
)
do
# These are extensions that must be enabled in order to support this database
enable_extension
"plpgsql"
...
...
lib/gitlab/path_regex.rb
浏览文件 @
bf3d1900
...
...
@@ -40,6 +40,7 @@ module Gitlab
invites
jwt
koding
login
notification_settings
oauth
profile
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录