From ddc243d9b6cc434101e645a768c2453947316deb Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Mon, 24 Oct 2016 14:42:33 -0500 Subject: [PATCH 1/2] Show full status link on MR & commit pipelines --- app/views/projects/ci/pipelines/_pipeline.html.haml | 5 +---- app/views/projects/commit/_pipelines_list.haml | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index c6f359f5679..f16d0b22538 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -5,10 +5,7 @@ %tr.commit %td.commit-link = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do - - if defined?(status_icon_only) && status_icon_only - = ci_icon_for_status(status) - - else - = ci_status_with_icon(status) + = ci_status_with_icon(status) %td = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do diff --git a/app/views/projects/commit/_pipelines_list.haml b/app/views/projects/commit/_pipelines_list.haml index ac451441eec..2dc91a9b762 100644 --- a/app/views/projects/commit/_pipelines_list.haml +++ b/app/views/projects/commit/_pipelines_list.haml @@ -12,4 +12,4 @@ %th Stages %th %th - = render pipelines, commit_sha: true, stage: true, allow_retry: true, stages: pipelines.stages, status_icon_only: true, show_commit: false + = render pipelines, commit_sha: true, stage: true, allow_retry: true, stages: pipelines.stages, show_commit: false From 1ec84850407d6b5e6248825be61ea24178f242a4 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Tue, 25 Oct 2016 09:08:19 -0500 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86878e5af6c..bde4552a1b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Fix: Backup restore doesn't clear cache - Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests method - Fix Sign in page 'Forgot your password?' link overlaps on medium-large screens + - Show full status link on MR & commit pipelines - Fix documents and comments on Build API `scope` - Refactor email, use setter method instead AR callbacks for email attribute (Semyon Pupkov)