diff options
| author | Phil Hughes <me@iamphill.com> | 2019-06-28 09:09:46 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-06-28 09:09:46 +0000 |
| commit | e10726f6045c5b26f0b95e21fab1f64869109c08 (patch) | |
| tree | 2078bc03b83ebd7507838e3022ef8c5c4b290379 | |
| parent | d9026d0ffa0ea1f2635c7359ea2bacc97d7967fd (diff) | |
| parent | dbbeb81e7bb9e868e3bba4301870438dd89f7fa0 (diff) | |
| download | gitlab-ce-e10726f6045c5b26f0b95e21fab1f64869109c08.tar.gz | |
Merge branch '6360-tree-header' into 'master'
Removes EE differences for app/views/projects/tree/_tree_header.html.haml
See merge request gitlab-org/gitlab-ce!30117
| -rw-r--r-- | app/views/projects/tree/_tree_header.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/projects/tree/_tree_header.html.haml b/app/views/projects/tree/_tree_header.html.haml index ea6349f2f57..1d0bc588c9c 100644 --- a/app/views/projects/tree/_tree_header.html.haml +++ b/app/views/projects/tree/_tree_header.html.haml @@ -76,6 +76,7 @@ #{ _('New tag') } .tree-controls + = render_if_exists 'projects/tree/lock_link' = link_to s_('Commits|History'), project_commits_path(@project, @id), class: 'btn' = render 'projects/find_file_link' |