diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-10-27 01:37:41 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-10-27 01:37:41 +0800 |
| commit | 6f6a8d2a671cf3bc2df2832081f528d9b06e27be (patch) | |
| tree | cbfeba0e5ac9ef137c343438a7e14e9558ee26aa | |
| parent | b4ef158a63807c850c1a17c75d66cd166c309047 (diff) | |
| download | gitlab-ce-6f6a8d2a671cf3bc2df2832081f528d9b06e27be.tar.gz | |
Also update for default project page, feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7034#note_17397573
| -rw-r--r-- | app/views/projects/_last_commit.html.haml | 9 | ||||
| -rw-r--r-- | app/views/projects/commits/_commit.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/app/views/projects/_last_commit.html.haml b/app/views/projects/_last_commit.html.haml index 630ae7d6140..593967d9310 100644 --- a/app/views/projects/_last_commit.html.haml +++ b/app/views/projects/_last_commit.html.haml @@ -1,7 +1,8 @@ -- if commit.status - = link_to builds_namespace_project_commit_path(commit.project.namespace, commit.project, commit), class: "ci-status ci-#{commit.status}" do - = ci_icon_for_status(commit.status) - = ci_label_for_status(commit.status) +- status = commit.status_for(ref) +- if status + = link_to builds_namespace_project_commit_path(commit.project.namespace, commit.project, commit), class: "ci-status ci-#{status}" do + = ci_icon_for_status(status) + = ci_label_for_status(status) = link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit_short_id" = link_to_gfm commit.title, namespace_project_commit_path(project.namespace, project, commit), class: "commit-row-message" diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index 9303243b119..c5830b5b7f7 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -18,14 +18,14 @@ %span.commit-row-message.visible-xs-inline · = commit.short_id - - if commit.status + - if commit.status_for(ref) .visible-xs-inline = render_commit_status(commit, ref: ref) - if commit.description? %a.text-expander.hidden-xs.js-toggle-button ... .commit-actions.hidden-xs - - if commit.status + - if commit.status_for(ref) = render_commit_status(commit, ref: ref) = clipboard_button(clipboard_text: commit.id) = link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit-short-id btn btn-transparent" diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index ba16c641462..69a3bc5f046 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -79,7 +79,7 @@ = render 'shared/notifications/button', notification_setting: @notification_setting - if @repository.commit .project-last-commit{ class: container_class } - = render 'projects/last_commit', commit: @repository.commit, project: @project + = render 'projects/last_commit', commit: @repository.commit, ref: current_ref, project: @project %div{ class: container_class } - if @project.archived? |