diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-10-03 22:30:20 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-10-03 22:30:20 +0000 |
commit | ffdc854d57c28ce5037c6dccf473fa6616afd7f2 (patch) | |
tree | e413014bc1563e27395ca3c4d7a45688c7efda3d /app/views | |
parent | ef642b3c52b5ac54ac322bd6dd35edb5e3d4350e (diff) | |
parent | 089ac50f92f4b7c035b961645b58d33e541b0db9 (diff) | |
download | gitlab-ce-ffdc854d57c28ce5037c6dccf473fa6616afd7f2.tar.gz |
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
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/projects/merge_requests/widget/_heading.html.haml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml index 44e645a7e81..b5f5e11d4c3 100644 --- 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 |