Commit 2fc359a5 authored by Alfredo Sumaran's avatar Alfredo Sumaran

Merge branch '23607-mr-pipeline-status' into 'master'

Show full status link on MR & commit pipelines

Before:   
![Screen_Shot_2016-10-24_at_2.43.09_PM](/uploads/5543b6e134a5349650b24dcb1b1a9082/Screen_Shot_2016-10-24_at_2.43.09_PM.png)

After:   
![Screen_Shot_2016-10-24_at_2.42.55_PM](/uploads/a561c8708ca2b17d11c0eb9b2cfd0b9b/Screen_Shot_2016-10-24_at_2.42.55_PM.png)

Closes #23607

See merge request !7079
parents dd5e46ab 1ec84850
...@@ -20,6 +20,7 @@ Please view this file on the master branch, on stable branches it's out of date. ...@@ -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 - Replace jquery.cookie plugin with js.cookie !7085
- Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests method - Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests method
- Fix Sign in page 'Forgot your password?' link overlaps on medium-large screens - 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` - Fix documents and comments on Build API `scope`
- Refactor email, use setter method instead AR callbacks for email attribute (Semyon Pupkov) - Refactor email, use setter method instead AR callbacks for email attribute (Semyon Pupkov)
......
...@@ -5,10 +5,7 @@ ...@@ -5,10 +5,7 @@
%tr.commit %tr.commit
%td.commit-link %td.commit-link
= link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do
- if defined?(status_icon_only) && status_icon_only = ci_status_with_icon(status)
= ci_icon_for_status(status)
- else
= ci_status_with_icon(status)
%td %td
= link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do
......
...@@ -12,4 +12,4 @@ ...@@ -12,4 +12,4 @@
%th Stages %th Stages
%th %th
%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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment