Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
b767596cb244
Unverified
Commit
d514833a
authored
Jun 02, 2014
by
Dmitriy Zaporozhets
Browse files
Dont show new file link on protected branch for developers
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
40d30bf1fec9
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/helpers/branches_helper.rb
View file @
b767596c
module
BranchesHelper
def
can_remove_branch?
(
project
,
branch_name
)
if
project
.
protected_branch?
branch_name
false
elsif
branch_name
==
project
.
repository
.
root_ref
false
else
can?
(
current_user
,
:push_code
,
project
)
end
if
project
.
protected_branch?
branch_name
false
elsif
branch_name
==
project
.
repository
.
root_ref
false
else
can?
(
current_user
,
:push_code
,
project
)
end
end
def
can_push_branch?
(
project
,
branch_name
)
return
false
unless
project
.
repository
.
branch_names
.
include?
(
branch_name
)
action
=
if
project
.
protected_branch?
(
branch_name
)
:push_code_to_protected_branches
else
:push_code
end
current_user
.
can?
(
action
,
project
)
end
end
app/views/projects/tree/_tree.html.haml
View file @
b767596c
...
...
@@ -9,7 +9,7 @@
=
link_to
truncate
(
title
,
length:
40
),
project_tree_path
(
@project
,
path
)
-
else
=
link_to
title
,
'#'
-
if
current_user
&&
@repository
.
branch_names
.
include?
(
@ref
)
&&
current_user
.
can?
(
:push_code
,
@project
)
-
if
current_user
&&
can_push_branch?
(
@project
,
@ref
)
%li
=
link_to
project_new_tree_path
(
@project
,
@id
),
title:
'New file'
,
id:
'new-file-link'
do
%small
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment