kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '27013-regression-in-commit-title-bar' into 'master'

Browse source 
Resolve "regression in commit title bar"

Closes #27013

See merge request !8751
This commit is contained in:
Annabel Dunstone Gray 2017-01-25 22:40:49 +00:00
commit 6f9f9961ef
4 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/pages/tree.scss
View file

@ -32,6 +32,10 @@
.last-commit { .last-commit {
@include str-truncated(506px); @include str-truncated(506px);
.fa-angle-right {
margin-left: 5px;
}
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) { @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
@include str-truncated(450px); @include str-truncated(450px);
} }

3
app/views/projects/commit/_commit_box.html.haml
View file

@ -1,8 +1,7 @@
.page-content-header .page-content-header
.header-main-content .header-main-content
%strong %strong Commit #{@commit.short_id}
= clipboard_button(clipboard_text: @commit.id, title: "Copy commit SHA to clipboard") = clipboard_button(clipboard_text: @commit.id, title: "Copy commit SHA to clipboard")
= @commit.short_id
%span.hidden-xs authored %span.hidden-xs authored
#{time_ago_with_tooltip(@commit.authored_date)} #{time_ago_with_tooltip(@commit.authored_date)}
%span by %span by

4
app/views/projects/tree/_tree_content.html.haml
View file

@ -7,10 +7,12 @@
%th.hidden-xs %th.hidden-xs
.pull-left Last commit .pull-left Last commit
.last-commit.hidden-sm.pull-left .last-commit.hidden-sm.pull-left
%i.fa.fa-angle-right
%small.light %small.light
= clipboard_button(clipboard_text: @commit.id, title: "Copy commit SHA to clipboard")
= link_to @commit.short_id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace" = link_to @commit.short_id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace"
= clipboard_button(clipboard_text: @commit.id, title: "Copy commit SHA to clipboard")
= time_ago_with_tooltip(@commit.committed_date) = time_ago_with_tooltip(@commit.committed_date)
\-
= @commit.full_title = @commit.full_title
%small.commit-history-link-spacer | %small.commit-history-link-spacer |
= link_to 'History', namespace_project_commits_path(@project.namespace, @project, @id), class: 'commit-history-link' = link_to 'History', namespace_project_commits_path(@project.namespace, @project, @id), class: 'commit-history-link'

4
changelogs/unreleased/27013-regression-in-commit-title-bar.yml Normal file
View file

@ -0,0 +1,4 @@
---
title: Fix commit title bar and repository view copy clipboard button order on last commit in repository view
merge_request:
author: