diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 12:08:48 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 12:08:48 +0000 |
commit | f7dae0cdcb70ecb71c1d65f099e9d96b27a4548c (patch) | |
tree | e53baffa847c4fd37c8e335e4d93d603c75f9f02 /app/views/projects/tree | |
parent | b98fa9ef3d5bead417ae2f325cb64637883264e9 (diff) | |
download | gitlab-ce-f7dae0cdcb70ecb71c1d65f099e9d96b27a4548c.tar.gz |
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 | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/app/views/projects/tree/_tree_header.html.haml b/app/views/projects/tree/_tree_header.html.haml index 4d3c24aee6b..d5f7673488f 100644 --- a/app/views/projects/tree/_tree_header.html.haml +++ b/app/views/projects/tree/_tree_header.html.haml @@ -75,34 +75,35 @@ = link_to new_project_tag_path(@project) do #{ _('New tag') } -.tree-controls{ class: ("gl-font-size-0" if vue_file_list_enabled?) }< - = render_if_exists 'projects/tree/lock_link' - - 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_collaborate || current_user&.already_forked?(@project) +.tree-controls + .d-block.d-sm-flex.flex-wrap.align-items-start.gl-children-ml-sm-3< + = render_if_exists 'projects/tree/lock_link' - if vue_file_list_enabled? - #js-tree-web-ide-link.d-inline-block + #js-tree-history-link.d-inline-block{ data: { history_link: project_commits_path(@project, @ref) } } - else - = link_to ide_edit_path(@project, @ref, @path), class: 'btn btn-default qa-web-ide-button' do + = link_to s_('Commits|History'), project_commits_path(@project, @id), class: 'btn' + + = render 'projects/find_file_link' + + - if can_collaborate || current_user&.already_forked?(@project) + - 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') + - elsif can_create_mr_from_fork + = link_to '#modal-confirm-fork', class: 'btn btn-default qa-web-ide-button', data: { target: '#modal-confirm-fork', toggle: 'modal'} do = _('Web IDE') - - elsif can_create_mr_from_fork - = link_to '#modal-confirm-fork', class: 'btn btn-default qa-web-ide-button', data: { target: '#modal-confirm-fork', toggle: 'modal'} do - = _('Web IDE') - = render 'shared/confirm_fork_modal', fork_path: ide_fork_and_edit_path(@project, @ref, @path) + = render 'shared/confirm_fork_modal', fork_path: ide_fork_and_edit_path(@project, @ref, @path) - - if show_xcode_link?(@project) - .project-action-button.project-xcode.inline< - = render "projects/buttons/xcode_link" + - if show_xcode_link?(@project) + .project-action-button.project-xcode.inline< + = render "projects/buttons/xcode_link" - = render 'projects/buttons/download', project: @project, ref: @ref + = render 'projects/buttons/download', project: @project, ref: @ref - .project-clone-holder.d-block.d-md-none.mt-sm-2.mt-md-0> - = render "shared/mobile_clone_panel" + .project-clone-holder.d-none.d-md-inline-block> + = render "projects/buttons/clone", dropdown_class: 'dropdown-menu-right' - .project-clone-holder.d-none.d-md-inline-block> - = render "projects/buttons/clone", dropdown_class: 'dropdown-menu-right' + .project-clone-holder.d-block.d-md-none.mt-sm-2.mt-md-0.ml-sm-2> + = render "shared/mobile_clone_panel" |