Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
9dbd5b3c
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,发现更多精彩内容 >>
提交
9dbd5b3c
编写于
10月 24, 2016
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "Change "Group#web_url" to return "/groups/twitter" rather than "/twitter"."
This reverts commit
c81ff152
.
上级
1a7ba2a5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
25 deletion
+16
-25
app/models/group.rb
app/models/group.rb
+1
-1
config/routes/group.rb
config/routes/group.rb
+15
-18
spec/models/group_spec.rb
spec/models/group_spec.rb
+0
-6
未找到文件。
app/models/group.rb
浏览文件 @
9dbd5b3c
...
...
@@ -68,7 +68,7 @@ class Group < Namespace
end
def
web_url
Gitlab
::
Routing
.
url_helpers
.
group_
canonical_
url
(
self
)
Gitlab
::
Routing
.
url_helpers
.
group_url
(
self
)
end
def
human_name
...
...
config/routes/group.rb
浏览文件 @
9dbd5b3c
...
...
@@ -12,26 +12,23 @@ constraints(GroupUrlConstrainer.new) do
end
end
scope
constraints:
{
id:
/[a-zA-Z.0-9_\-]+(?<!\.atom)/
}
do
resources
:groups
,
except:
[
:show
]
do
member
do
get
:issues
get
:merge_requests
get
:projects
get
:activity
end
resources
:groups
,
constraints:
{
id:
/[a-zA-Z.0-9_\-]+(?<!\.atom)/
}
do
member
do
get
:issues
get
:merge_requests
get
:projects
get
:activity
end
scope
module: :groups
do
resources
:group_members
,
only:
[
:index
,
:create
,
:update
,
:destroy
],
concerns: :access_requestable
do
post
:resend_invite
,
on: :member
delete
:leave
,
on: :collection
end
scope
module: :groups
do
resources
:group_members
,
only:
[
:index
,
:create
,
:update
,
:destroy
],
concerns: :access_requestable
do
post
:resend_invite
,
on: :member
delete
:leave
,
on: :collection
end
resource
:avatar
,
only:
[
:destroy
]
resources
:milestones
,
constraints:
{
id:
/[^\/]+/
},
only:
[
:index
,
:show
,
:update
,
:new
,
:create
]
resource
:avatar
,
only:
[
:destroy
]
resources
:milestones
,
constraints:
{
id:
/[^\/]+/
},
only:
[
:index
,
:show
,
:update
,
:new
,
:create
]
resources
:labels
,
except:
[
:show
],
constraints:
{
id:
/\d+/
}
end
resources
:labels
,
except:
[
:show
],
constraints:
{
id:
/\d+/
}
end
get
'groups/:id'
=>
'groups#show'
,
as: :group_canonical
end
spec/models/group_spec.rb
浏览文件 @
9dbd5b3c
...
...
@@ -265,10 +265,4 @@ describe Group, models: true do
members
end
describe
'#web_url'
do
it
'returns the canonical URL'
do
expect
(
group
.
web_url
).
to
include
(
"groups/
#{
group
.
name
}
"
)
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录