diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-15 14:16:08 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-15 14:16:08 +0300 |
| commit | 5750cf3bf7f7d4311116bedd3e2e32908520d0e2 (patch) | |
| tree | 605aa712ce4b169a757fbe339dae7a024836e409 | |
| parent | 682e1d093149b25eef8cd670a7d7ca3ccee834f2 (diff) | |
| parent | 73ce52dc61bb3a8d692484b8774c0e6b4717bdfc (diff) | |
Merge branch 'proj-branches-index-scb' into 'master'
Resolve CE/EE diffs in project branches
See merge request gitlab-org/gitlab-ce!28261
| -rw-r--r-- | app/views/projects/branches/index.html.haml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml index 43f1cd01b67..d270e461ac8 100644 --- a/app/views/projects/branches/index.html.haml +++ b/app/views/projects/branches/index.html.haml @@ -1,5 +1,6 @@ - @no_container = true - page_title _('Branches') +- add_to_breadcrumbs(_('Repository'), project_tree_path(@project)) %div{ class: container_class } .top-area.adjust @@ -44,6 +45,8 @@ = link_to new_project_branch_path(@project), class: 'btn btn-success' do = s_('Branches|New branch') + = render_if_exists 'projects/commits/mirror_status' + - if can?(current_user, :admin_project, @project) - project_settings_link = link_to s_('Branches|project settings'), project_protected_branches_path(@project) .row-content-block |