kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Resolve CE/EE diffs in project branches

Browse source 
Part of single codebase changes.
This commit is contained in:
Luke Bennett 2019-05-11 06:16:43 +01:00
parent 825b2bdafd
commit 73ce52dc61
No known key found for this signature in database
GPG key ID: 402ED51FB5D306C2
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/views/projects/branches/index.html.haml
View file

@ -1,5 +1,6 @@
- @no_container = true - @no_container = true
- page_title _('Branches') - page_title _('Branches')
- add_to_breadcrumbs(_('Repository'), project_tree_path(@project))
%div{ class: container_class } %div{ class: container_class }
.top-area.adjust .top-area.adjust
@ -44,6 +45,8 @@
= link_to new_project_branch_path(@project), class: 'btn btn-success' do = link_to new_project_branch_path(@project), class: 'btn btn-success' do
= s_('Branches|New branch') = s_('Branches|New branch')
= render_if_exists 'projects/commits/mirror_status'
- if can?(current_user, :admin_project, @project) - if can?(current_user, :admin_project, @project)
- project_settings_link = link_to s_('Branches|project settings'), project_protected_branches_path(@project) - project_settings_link = link_to s_('Branches|project settings'), project_protected_branches_path(@project)
.row-content-block .row-content-block