Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6cdbb1e6
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,发现更多精彩内容 >>
提交
6cdbb1e6
编写于
6月 29, 2017
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix 'New merge request' button for users who don't have push access to canonical project
上级
3d49246d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
3 deletion
+10
-3
app/views/projects/merge_requests/index.html.haml
app/views/projects/merge_requests/index.html.haml
+5
-3
changelogs/unreleased/dm-empty-state-new-merge-request.yml
changelogs/unreleased/dm-empty-state-new-merge-request.yml
+5
-0
未找到文件。
app/views/projects/merge_requests/index.html.haml
浏览文件 @
6cdbb1e6
...
...
@@ -13,6 +13,9 @@
=
render
'projects/last_push'
-
merge_project
=
can?
(
current_user
,
:create_merge_request
,
@project
)
?
@project
:
(
current_user
&&
current_user
.
fork_of
(
@project
))
-
new_merge_request_path
=
namespace_project_new_merge_request_path
(
merge_project
.
namespace
,
merge_project
)
if
merge_project
-
if
@project
.
merge_requests
.
exists?
%div
{
class:
container_class
}
.top-area
...
...
@@ -20,9 +23,8 @@
.nav-controls
-
if
@can_bulk_update
=
button_tag
"Edit Merge Requests"
,
class:
"btn js-bulk-update-toggle"
-
merge_project
=
can?
(
current_user
,
:create_merge_request
,
@project
)
?
@project
:
(
current_user
&&
current_user
.
fork_of
(
@project
))
-
if
merge_project
=
link_to
n
amespace_project_new_merge_request_path
(
merge_project
.
namespace
,
merge_project
)
,
class:
"btn btn-new"
,
title:
"New merge request"
do
=
link_to
n
ew_merge_request_path
,
class:
"btn btn-new"
,
title:
"New merge request"
do
New merge request
=
render
'shared/issuable/search_bar'
,
type: :merge_requests
...
...
@@ -33,4 +35,4 @@
.merge-requests-holder
=
render
'merge_requests'
-
else
=
render
'shared/empty_states/merge_requests'
,
button_path:
n
amespace_project_new_merge_request_path
(
@project
.
namespace
,
@project
)
=
render
'shared/empty_states/merge_requests'
,
button_path:
n
ew_merge_request_path
changelogs/unreleased/dm-empty-state-new-merge-request.yml
0 → 100644
浏览文件 @
6cdbb1e6
---
title
:
Fix 'New merge request' button for users who don't have push access to canonical
project
merge_request
:
author
:
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录