diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-30 15:06:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-30 15:06:34 +0300 |
| commit | 228d752ff09362002cc904d28edee7d63cc3cef2 (patch) | |
| tree | 63e7ff466c0b0794f67c87c34e874f8682fb5de0 /app/views/projects/tree | |
| parent | b539ac1d619c0aafe5988ab8b125a8b43b14d87f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/tree')
| -rw-r--r-- | app/views/projects/tree/_tree_header.html.haml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/app/views/projects/tree/_tree_header.html.haml b/app/views/projects/tree/_tree_header.html.haml index 38422d4533d..127734ddfd7 100644 --- a/app/views/projects/tree/_tree_header.html.haml +++ b/app/views/projects/tree/_tree_header.html.haml @@ -77,15 +77,21 @@ .tree-controls = render_if_exists 'projects/tree/lock_link' - = link_to s_('Commits|History'), project_commits_path(@project, @id), class: 'btn' + - if vue_file_list_enabled? + #js-tree-history-link.d-inline-block{ data: { history_link: project_commits_path(@project, @ref) } } + - else + = link_to s_('Commits|History'), project_commits_path(@project, @id), class: 'btn' = render 'projects/find_file_link' - if can_create_mr_from_fork = succeed " " do - if can_collaborate || current_user&.already_forked?(@project) - = link_to ide_edit_path(@project, @ref, @path), class: 'btn btn-default qa-web-ide-button' do - = _('Web IDE') + - if vue_file_list_enabled? + #js-tree-web-ide-link.d-inline-block + - else + = link_to ide_edit_path(@project, @ref, @path), class: 'btn btn-default qa-web-ide-button' do + = _('Web IDE') - else = link_to '#modal-confirm-fork', class: 'btn btn-default qa-web-ide-button', data: { target: '#modal-confirm-fork', toggle: 'modal'} do = _('Web IDE') |