diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-23 18:09:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-23 18:09:28 +0300 |
commit | c46b011d3f578d2455443dfabf24226c738c8903 (patch) | |
tree | 89107fa4ccf5340dc14a7d0d2f74a0372e56985f /app/views/projects/commit | |
parent | b38fc20ae0e90d5b1c538a139aa0a7da1b7b5726 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/commit')
-rw-r--r-- | app/views/projects/commit/_commit_box.html.haml | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index 974393b893b..ff51f3f4a21 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -1,5 +1,3 @@ -- can_collaborate = can_collaborate_with_project?(@project) - .page-content-header .header-main-content = render partial: 'signature', object: @commit.signature @@ -20,36 +18,12 @@ = commit_committer_link(@commit, avatar: true, size: 24) #{time_ago_with_tooltip(@commit.committed_date)} - .header-action-buttons - - if defined?(@notes_count) && @notes_count > 0 - %span.btn.gl-button.btn-default.disabled.gl-button.btn-icon.d-none.d-sm-inline.gl-mr-3.has-tooltip{ title: n_("%d comment on this commit", "%d comments on this commit", @notes_count) % @notes_count } - = sprite_icon('comment') - = @notes_count - = link_to project_tree_path(@project, @commit), class: "btn gl-button btn-default gl-mr-3 d-none d-md-inline" do - #{ _('Browse files') } - .dropdown.inline - %a.btn.gl-button.btn-default.dropdown-toggle.qa-options-button.d-md-inline{ data: { toggle: "dropdown" } } - %span= _('Options') - = sprite_icon('chevron-down', css_class: 'gl-text-gray-500') - %ul.dropdown-menu.dropdown-menu-right - %li.d-block.d-sm-none - = link_to project_tree_path(@project, @commit) do - #{ _('Browse Files') } - - if can_collaborate && !@commit.has_been_reverted?(current_user) - %li.clearfix - = revert_commit_link - - if can_collaborate - %li.clearfix - = cherry_pick_commit_link - - if can?(current_user, :push_code, @project) - %li.clearfix - = link_to s_('CreateTag|Tag'), new_project_tag_path(@project, ref: @commit) - %li.divider - %li.dropdown-header - #{ _('Download') } - - unless @commit.parents.length > 1 - %li= link_to s_('DownloadCommit|Email Patches'), project_commit_path(@project, @commit, format: :patch), class: "qa-email-patches", rel: 'nofollow', download: '' - %li= link_to s_('DownloadCommit|Plain Diff'), project_commit_path(@project, @commit, format: :diff), class: "qa-plain-diff", rel: 'nofollow', download: '' + - if defined?(@notes_count) && @notes_count > 0 + %span.btn.gl-button.btn-default.disabled.gl-button.btn-icon.d-none.d-sm-inline.gl-mr-3.has-tooltip{ title: n_("%d comment on this commit", "%d comments on this commit", @notes_count) % @notes_count } + = sprite_icon('comment') + = @notes_count + = link_to _('Browse files'), project_tree_path(@project, @commit), class: "btn gl-button btn-default gl-mr-3 gl-xs-w-full gl-xs-mb-3" + #js-commit-options-dropdown{ data: commit_options_dropdown_data(@project, @commit) } .commit-box{ data: { project_path: project_path(@project) } } %h3.commit-title |