Commit 34cf3c49 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'developers-protected-branches' into 'master'

Dont show new file link on protected branch for developers
parents 2c46b35b d514833a
......@@ -8,4 +8,15 @@ module BranchesHelper
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
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment