diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-11-22 21:50:19 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-22 21:50:19 +0000 |
commit | 1fc21ed838fc14401e8acb5bf761bcbf459d9a2c (patch) | |
tree | 4775401ced80187ad3f4b70bd5eaf05b244b24a4 /app/views | |
parent | 5c9cb3a393a34cee618d52844152ed5f2ffd49bf (diff) | |
parent | 6c0f104f67dc34311e8b430282b3171a0fe04f02 (diff) | |
download | gitlab-ce-1fc21ed838fc14401e8acb5bf761bcbf459d9a2c.tar.gz |
Merge branch '24639-mr-widget-updates' into 'master'
Unify all MR widget text colors and background colors
* Removes darker background color for `skipped` status
* Makes all MR widget text gray
Before:
![Screen_Shot_2016-11-18_at_7.52.16_AM](/uploads/4ee715aec9c453c5cfe1f259049adbde/Screen_Shot_2016-11-18_at_7.52.16_AM.png)
After:
![Screen_Shot_2016-11-18_at_7.52.05_AM](/uploads/ea14d713a4e7d837bac4576815451dce/Screen_Shot_2016-11-18_at_7.52.05_AM.png)
Closes #24639
See merge request !7571
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/projects/merge_requests/widget/_heading.html.haml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml index 09c41f947b0..18c72ed875c 100644 --- a/app/views/projects/merge_requests/widget/_heading.html.haml +++ b/app/views/projects/merge_requests/widget/_heading.html.haml @@ -12,7 +12,6 @@ = succeed "." do = link_to @pipeline.short_sha, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, @pipeline.sha), class: "monospace" %span.ci-coverage - = link_to "View details", pipelines_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "js-show-tab", data: {action: 'pipelines'} - elsif @merge_request.has_ci? - # Compatibility with old CI integrations (ex jenkins) when you request status from CI server via AJAX @@ -29,8 +28,6 @@ = succeed "." do = link_to commit.short_id, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, commit), class: "monospace" %span.ci-coverage - - if details_path = ci_build_details_path(@merge_request) - = link_to "View details", details_path, :"data-no-turbolink" => "data-no-turbolink" .ci_widget = icon("spinner spin") |