Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
083b0a9b
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,发现更多精彩内容 >>
提交
083b0a9b
编写于
4月 06, 2018
作者:
B
Bob Van Landuyt
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Hide file/directory creation buttons
上级
1747a573
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
59 addition
and
28 deletion
+59
-28
app/helpers/blob_helper.rb
app/helpers/blob_helper.rb
+2
-2
app/views/projects/_last_push.html.haml
app/views/projects/_last_push.html.haml
+3
-2
app/views/projects/branches/_branch.html.haml
app/views/projects/branches/_branch.html.haml
+1
-1
app/views/projects/buttons/_dropdown.html.haml
app/views/projects/buttons/_dropdown.html.haml
+13
-9
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+4
-2
app/views/projects/issues/_new_branch.html.haml
app/views/projects/issues/_new_branch.html.haml
+4
-4
app/views/projects/tree/_tree_header.html.haml
app/views/projects/tree/_tree_header.html.haml
+9
-5
spec/features/projects/branches_spec.rb
spec/features/projects/branches_spec.rb
+21
-1
spec/views/projects/buttons/_dropdown.html.haml_spec.rb
spec/views/projects/buttons/_dropdown.html.haml_spec.rb
+2
-1
spec/views/projects/tree/show.html.haml_spec.rb
spec/views/projects/tree/show.html.haml_spec.rb
+0
-1
未找到文件。
app/helpers/blob_helper.rb
浏览文件 @
083b0a9b
...
...
@@ -59,7 +59,7 @@ module BlobHelper
button_tag
label
,
class:
"
#{
common_classes
}
disabled has-tooltip"
,
title:
"It is not possible to
#{
action
}
files that are stored in LFS using the web interface"
,
data:
{
container:
'body'
}
elsif
can_modify_blob?
(
blob
,
project
,
ref
)
button_tag
label
,
class:
"
#{
common_classes
}
"
,
'data-target'
=>
"#modal-
#{
modal_type
}
-blob"
,
'data-toggle'
=>
'modal'
elsif
can?
(
current_user
,
:create_merge_request_in
,
project
)
elsif
can?
(
current_user
,
:
fork_project
,
project
)
&&
can?
(
current_user
,
:
create_merge_request_in
,
project
)
edit_fork_button_tag
(
common_classes
,
project
,
label
,
edit_modify_file_fork_params
(
action
),
action
)
end
end
...
...
@@ -280,7 +280,7 @@ module BlobHelper
options
<<
link_to
(
"submit an issue"
,
new_project_issue_path
(
project
))
end
merge_project
=
can?
(
current_user
,
:create_merge_request_from
,
project
)
?
project
:
(
current_user
&&
current_user
.
fork_of
(
project
)
)
merge_project
=
merge_request_source_project_for_project
(
@project
)
if
merge_project
options
<<
link_to
(
"create a merge request"
,
project_new_merge_request_path
(
project
))
end
...
...
app/views/projects/_last_push.html.haml
浏览文件 @
083b0a9b
...
...
@@ -14,5 +14,6 @@
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
.flex-right
=
link_to
new_mr_path_from_push_event
(
event
),
title:
_
(
"New merge request"
),
class:
"btn btn-info btn-sm qa-create-merge-request"
do
#{
_
(
'Create merge request'
)
}
-
if
can?
(
current_user
,
:create_merge_request_in
,
@project
)
=
link_to
new_mr_path_from_push_event
(
event
),
title:
_
(
"New merge request"
),
class:
"btn btn-info btn-sm qa-create-merge-request"
do
#{
_
(
'Create merge request'
)
}
app/views/projects/branches/_branch.html.haml
浏览文件 @
083b0a9b
...
...
@@ -4,7 +4,7 @@
-
diverging_commit_counts
=
@repository
.
diverging_commit_counts
(
branch
)
-
number_commits_behind
=
diverging_commit_counts
[
:behind
]
-
number_commits_ahead
=
diverging_commit_counts
[
:ahead
]
-
merge_project
=
can?
(
current_user
,
:create_merge_request_from
,
@project
)
?
@project
:
(
current_user
&&
current_user
.
fork_of
(
@project
)
)
-
merge_project
=
merge_request_source_project_for_project
(
@project
)
%li
{
class:
"branch-item js-branch-#{branch.name}"
}
.branch-info
.branch-title
...
...
app/views/projects/buttons/_dropdown.html.haml
浏览文件 @
083b0a9b
-
if
current_user
-
can_create_issue
=
show_new_issue_link?
-
can_create_project_snippet
=
can?
(
current_user
,
:create_project_snippet
,
@project
)
-
can_push_code
=
can?
(
current_user
,
:push_code
,
@project
)
-
create_mr_from_new_fork
=
can?
(
current_user
,
:fork_project
,
@project
)
&&
can?
(
current_user
,
:create_merge_request_in
,
@project
)
-
merge_project
=
merge_request_source_project_for_project
(
@project
)
-
show_menu
=
can_create_issue
||
can_create_project_snippet
||
can_push_code
||
create_mr_from_new_fork
||
merge_project
-
if
show_menu
.project-action-button.dropdown.inline
%a
.btn.dropdown-toggle.has-tooltip
{
href:
'#'
,
title:
_
(
'Create new...'
),
'data-toggle'
=>
'dropdown'
,
'data-container'
=>
'body'
,
'aria-label'
=>
_
(
'Create new...'
)
}
=
icon
(
'plus'
)
=
icon
(
"caret-down"
)
%ul
.dropdown-menu.dropdown-menu-align-right.project-home-dropdown
-
can_create_issue
=
can?
(
current_user
,
:create_issue
,
@project
)
-
merge_project
=
can?
(
current_user
,
:create_merge_request
,
@project
)
?
@project
:
(
current_user
&&
current_user
.
fork_of
(
@project
))
-
can_create_project_snippet
=
can?
(
current_user
,
:create_project_snippet
,
@project
)
-
if
can_create_issue
||
merge_project
||
can_create_project_snippet
%li
.dropdown-header
=
_
(
'This project'
)
...
...
@@ -20,17 +24,17 @@
-
if
can_create_project_snippet
%li
=
link_to
_
(
'New snippet'
),
new_project_snippet_path
(
@project
)
-
if
can
?
(
current_user
,
:push_code
,
@project
)
-
if
can
_push_code
%li
.dropdown-header
=
_
(
'This repository'
)
-
if
can
?
(
current_user
,
:push_code
,
@project
)
-
if
can
_push_code
%li
=
link_to
_
(
'New file'
),
project_new_blob_path
(
@project
,
@project
.
default_branch
||
'master'
)
-
unless
@project
.
empty_repo?
%li
=
link_to
_
(
'New branch'
),
new_project_branch_path
(
@project
)
%li
=
link_to
_
(
'New tag'
),
new_project_tag_path
(
@project
)
-
elsif
c
urrent_user
&&
current_user
.
already_forked
?
(
@project
)
-
elsif
c
an_collaborate_with_project
?
(
@project
)
%li
=
link_to
_
(
'New file'
),
project_new_blob_path
(
@project
,
@project
.
default_branch
||
'master'
)
-
elsif
c
an?
(
current_user
,
:fork_project
,
@project
)
-
elsif
c
reate_mr_from_new_fork
-
continue_params
=
{
to:
project_new_blob_path
(
@project
,
@project
.
default_branch
||
'master'
),
notice:
edit_in_new_fork_notice
,
notice_now:
edit_in_new_fork_notice_now
}
...
...
app/views/projects/commit/_commit_box.html.haml
浏览文件 @
083b0a9b
-
can_collaborate
=
can_collaborate_with_project?
(
@project
)
.page-content-header.js-commit-box
{
'data-commit-path'
=>
branches_project_commit_path
(
@project
,
@commit
.
id
)
}
.header-main-content
=
render
partial:
'signature'
,
object:
@commit
.
signature
...
...
@@ -32,10 +34,10 @@
%li
.visible-xs-block.visible-sm-block
=
link_to
project_tree_path
(
@project
,
@commit
)
do
#{
_
(
'Browse Files'
)
}
-
unless
@commit
.
has_been_reverted?
(
current_user
)
-
if
can_collaborate
&&
!
@commit
.
has_been_reverted?
(
current_user
)
%li
.clearfix
=
revert_commit_link
(
@commit
,
project_commit_path
(
@project
,
@commit
.
id
),
has_tooltip:
false
)
-
if
can_collaborate
_with_project?
(
@project
)
-
if
can_collaborate
%li
.clearfix
=
cherry_pick_commit_link
(
@commit
,
project_commit_path
(
@project
,
@commit
.
id
),
has_tooltip:
false
)
-
if
can?
(
current_user
,
:push_code
,
@project
)
...
...
app/views/projects/issues/_new_branch.html.haml
浏览文件 @
083b0a9b
-
can_create_merge_request
=
can?
(
current_user
,
:create_merge_request_from
,
@project
)
-
data_action
=
can_create_merge_request
?
'create-mr'
:
'create-branch'
-
value
=
can_create_merge_request
?
'Create merge request'
:
'Create branch'
-
if
can?
(
current_user
,
:push_code
,
@project
)
-
can_create_merge_request
=
can?
(
current_user
,
:create_merge_request_in
,
@project
)
-
data_action
=
can_create_merge_request
?
'create-mr'
:
'create-branch'
-
value
=
can_create_merge_request
?
'Create merge request'
:
'Create branch'
-
can_create_path
=
can_create_branch_project_issue_path
(
@project
,
@issue
)
-
create_mr_path
=
create_merge_request_project_issue_path
(
@project
,
@issue
,
branch_name:
@issue
.
to_branch_name
,
ref:
@project
.
default_branch
)
-
create_branch_path
=
project_branches_path
(
@project
,
branch_name:
@issue
.
to_branch_name
,
ref:
@project
.
default_branch
,
issue_iid:
@issue
.
iid
)
...
...
app/views/projects/tree/_tree_header.html.haml
浏览文件 @
083b0a9b
-
can_collaborate
=
can_collaborate_with_project?
(
@project
)
-
can_create_mr_from_fork
=
can?
(
current_user
,
:fork_project
,
@project
)
&&
can?
(
current_user
,
:create_merge_request_in
,
@project
)
.tree-ref-container
.tree-ref-holder
=
render
'shared/ref_switcher'
,
destination:
'tree'
,
path:
@path
,
show_create:
true
...
...
@@ -15,7 +18,7 @@
%li
=
link_to
truncate
(
title
,
length:
40
),
project_tree_path
(
@project
,
tree_join
(
@ref
,
path
))
-
if
c
urrent_user
-
if
c
an_collaborate
||
can_create_mr_from_fork
%li
%a
.btn.add-to-tree
{
addtotree_toggle_attributes
}
=
sprite_icon
(
'plus'
,
size:
16
,
css_class:
'pull-left'
)
...
...
@@ -35,7 +38,7 @@
%li
=
link_to
'#modal-create-new-dir'
,
{
'data-target'
=>
'#modal-create-new-dir'
,
'data-toggle'
=>
'modal'
}
do
#{
_
(
'New directory'
)
}
-
elsif
can?
(
current_user
,
:fork_project
,
@project
)
-
elsif
can?
(
current_user
,
:fork_project
,
@project
)
&&
can?
(
current_user
,
:create_merge_request_in
,
@project
)
%li
-
continue_params
=
{
to:
project_new_blob_path
(
@project
,
@id
),
notice:
edit_in_new_fork_notice
,
...
...
@@ -77,8 +80,9 @@
=
render
'projects/find_file_link'
=
succeed
" "
do
=
link_to
ide_edit_path
(
@project
,
@id
,
""
),
class:
'btn btn-default'
do
=
_
(
'Web IDE'
)
-
if
can_collaborate
=
succeed
" "
do
=
link_to
ide_edit_path
(
@project
,
@id
,
""
),
class:
'btn btn-default'
do
=
_
(
'Web IDE'
)
=
render
'projects/buttons/download'
,
project:
@project
,
ref:
@ref
spec/features/projects/branches_spec.rb
浏览文件 @
083b0a9b
...
...
@@ -195,6 +195,26 @@ describe 'Branches' do
expect
(
page
).
to
have_content
(
"Protected branches can be managed in project settings"
)
end
end
it
'shows the merge request button'
do
visit
project_branches_path
(
project
)
page
.
within
first
(
'.all-branches li'
)
do
expect
(
page
).
to
have_content
'Merge request'
end
end
context
'when the project is archived'
do
let
(
:project
)
{
create
(
:project
,
:public
,
:repository
,
archived:
true
)
}
it
'does not show the merge request button when the project is archived'
do
visit
project_branches_path
(
project
)
page
.
within
first
(
'.all-branches li'
)
do
expect
(
page
).
not_to
have_content
'Merge request'
end
end
end
end
context
'logged out'
do
...
...
@@ -204,7 +224,7 @@ describe 'Branches' do
it
'does not show merge request button'
do
page
.
within
first
(
'.all-branches li'
)
do
expect
(
page
).
not_to
have_content
'Merge
R
equest'
expect
(
page
).
not_to
have_content
'Merge
r
equest'
end
end
end
...
...
spec/views/projects/buttons/_dropdown.html.haml_spec.rb
浏览文件 @
083b0a9b
...
...
@@ -8,7 +8,8 @@ describe 'projects/buttons/_dropdown' do
assign
(
:project
,
project
)
allow
(
view
).
to
receive
(
:current_user
).
and_return
(
user
)
allow
(
view
).
to
receive
(
:can?
).
and_return
(
true
)
allow
(
view
).
to
receive
(
:can?
).
with
(
user
,
:push_code
,
project
).
and_return
(
true
)
allow
(
view
).
to
receive
(
:can_collaborate_with_project?
).
and_return
(
true
)
end
context
'empty repository'
do
...
...
spec/views/projects/tree/show.html.haml_spec.rb
浏览文件 @
083b0a9b
...
...
@@ -12,7 +12,6 @@ describe 'projects/tree/show' do
assign
(
:lfs_blob_ids
,
[])
allow
(
view
).
to
receive
(
:can?
).
and_return
(
true
)
allow
(
view
).
to
receive
(
:can_contribute_to_project?
).
and_return
(
true
)
allow
(
view
).
to
receive
(
:can_collaborate_with_project?
).
and_return
(
true
)
allow
(
view
).
to
receive_message_chain
(
'user_access.can_push_to_branch?'
).
and_return
(
true
)
allow
(
view
).
to
receive
(
:current_application_settings
).
and_return
(
Gitlab
::
CurrentSettings
.
current_application_settings
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录