Merge branch '22006-change-build-wording-to-pipeline-in-mr-block-add-pipeline-id' into 'master'

Changed mr widget build status to pipeline status ## What does this MR do? Changed mr widget build status to pipeline status with pipeline id, with a link to the pipeline. ## Are there points in the code the reviewer needs to double check? Do we want the link to the pipeline? /cc @dimitrieh ## Screenshots (if relevant) ![Screen_Shot_2016-09-14_at_02.42.23](/uploads/94a860361ab70eccf966e519764c6ec5/Screen_Shot_2016-09-14_at_02.42.23.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22006 See merge request !6335

Merge branch '22006-change-build-wording-to-pipeline-in-mr-block-add-pipeline-id' into 'master'
ffdc854d · Jacob Schatz · ef642b3c · 089ac50f · ffdc854d · ffdc854d
Commit ffdc854d authored Oct 03, 2016 by Jacob Schatz
Showing with 6 additions and 3 deletions

CHANGELOG CHANGELOG +1 -0

merge_requests.scss app/assets/stylesheets/pages/merge_requests.scss +2 -1

_heading.html.haml app/views/projects/merge_requests/widget/_heading.html.haml +3 -2

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -120,6 +120,7 @@ v 8.12.0
  - Reduce contributions calendar data payload (ClemMakesApps)
  - Show all pipelines for merge requests even from discarded commits !6414
  - Replace contributions calendar timezone payload with dates (ClemMakesApps)
+  - Changed MR widget build status to pipeline status !6335
  - Add `web_url` field to issue, merge request, and snippet API objects (Ben Boeckel)
  - Enable pipeline events by default !6278
  - Move parsing of sidekiq ps into helper !6245 (pascalbetz)

--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -70,7 +70,8 @@
    &.ci-success {
      color: $gl-success;

-      a.environment {
+      a.environment,
+      a.pipeline {
        color: inherit;
      }
    }

--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
@@ -4,14 +4,15 @@
      .ci_widget{ class: "ci-#{status}", style: ("display:none" unless @pipeline.status == status) }
        = ci_icon_for_status(status)
        %span
-          CI build
+          Pipeline
+          = link_to "##{@pipeline.id}", namespace_project_pipeline_path(@pipeline.project.namespace, @pipeline.project, @pipeline.id), class: 'pipeline'
          = ci_label_for_status(status)
        for
        - commit = @merge_request.diff_head_commit
        = 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", builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "js-show-tab", data: {action: 'builds'}
+        = 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