diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-11 23:33:50 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-11 23:33:50 +0200 |
| commit | 52be9e20f9e2382f01a778d7b348283e7dd757e6 (patch) | |
| tree | 2a22a5575f62c0ffada22ac27121c648544a4822 /app/views/projects/commits/_commit.html.haml | |
| parent | af7214d0f077f738ed57194feb0cd468c43d4310 (diff) | |
| parent | 7998725e3c2557c04ceece028dd73a316a3a746c (diff) | |
| download | gitlab-ce-52be9e20f9e2382f01a778d7b348283e7dd757e6.tar.gz | |
Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline
# Conflicts:
# app/views/projects/commits/_commit.html.haml
Diffstat (limited to 'app/views/projects/commits/_commit.html.haml')
| -rw-r--r-- | app/views/projects/commits/_commit.html.haml | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index fa34f7b7d61..f7c8647ac0e 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -18,24 +18,17 @@ .pull-right - if commit.status = render_ci_status(commit) - = clipboard_button(clipboard_text: commit.id) = link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit_short_id" - .notes_count - - if note_count > 0 - %span.light - %i.fa.fa-comments - = note_count - - if commit.description? .commit-row-description.js-toggle-content %pre = preserve(markdown(escape_once(commit.description), pipeline: :single_line)) .commit-row-info + by = commit_author_link(commit, avatar: true, size: 24) - authored .committed_ago #{time_ago_with_tooltip(commit.committed_date, skip_js: true)} = link_to_browse_code(project, commit) |