diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-26 16:41:43 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-26 16:41:43 +0000 |
| commit | 2fc359a506b5997cb65b6d5f2f5c85df98fd1c69 (patch) | |
| tree | 66d774b2cc72069deb495f0f0485530ae5a4bdc3 | |
| parent | dd5e46ab693910f41333109bc8dfd5488121b440 (diff) | |
| parent | 1ec84850407d6b5e6248825be61ea24178f242a4 (diff) | |
| download | gitlab-ce-2fc359a506b5997cb65b6d5f2f5c85df98fd1c69.tar.gz | |
Merge branch '23607-mr-pipeline-status' into 'master'
Show full status link on MR & commit pipelines
Before:
After:
Closes #23607
See merge request !7079
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/views/projects/ci/pipelines/_pipeline.html.haml | 5 | ||||
| -rw-r--r-- | app/views/projects/commit/_pipelines_list.haml | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a36a6652ec8..1049551239c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Replace jquery.cookie plugin with js.cookie !7085 - 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) 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 |