diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-13 17:28:38 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-13 17:28:38 +0000 |
commit | 03ea7d72626befb2aab4c9fc91e6423f264e1cdb (patch) | |
tree | 0b797779e6730362e72460edf1ff83755fa58ce9 /app/views/projects/builds | |
parent | 2688957330ae11c7d7b13596ae1a6360cb4a0384 (diff) | |
parent | d949db0519f38015b821c5af9821442ba6e17529 (diff) | |
download | gitlab-ce-03ea7d72626befb2aab4c9fc91e6423f264e1cdb.tar.gz |
Merge branch '22307-pipeline-link-in-builds-view' into 'master'
Resolve "Link from build page to its pipeline"
## What does this MR do?
Adds references and links to a build's pipeline within both individual build pages and the build index.
## Are there points in the code the reviewer needs to double check?
Nothing springs to mind
## Why was this MR needed?
See #22307
## Screenshots (if relevant)
![Screen_Shot_2016-10-24_at_3.45.39_PM_copy](/uploads/e6e8745a0a39d8b71c007e7df5fbd051/Screen_Shot_2016-10-24_at_3.45.39_PM_copy.png)
![Screen_Shot_2016-10-24_at_3.46.03_PM_copy](/uploads/3e2eb656347751f10bf62891b56ebcc7/Screen_Shot_2016-10-24_at_3.46.03_PM_copy.png)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- Tests
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #22307
See merge request !7082
Diffstat (limited to 'app/views/projects/builds')
-rw-r--r-- | app/views/projects/builds/_header.html.haml | 3 | ||||
-rw-r--r-- | app/views/projects/builds/_table.html.haml | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/builds/_header.html.haml b/app/views/projects/builds/_header.html.haml index 3f2ce7377fd..9f69bd64f71 100644 --- a/app/views/projects/builds/_header.html.haml +++ b/app/views/projects/builds/_header.html.haml @@ -3,6 +3,9 @@ = ci_status_with_icon(@build.status) Build %strong ##{@build.id} + in pipeline + = link_to pipeline_path(@build.pipeline) do + %strong ##{@build.pipeline.id} for commit = link_to ci_status_path(@build.pipeline) do %strong= @build.pipeline.short_sha diff --git a/app/views/projects/builds/_table.html.haml b/app/views/projects/builds/_table.html.haml index 36294c89fa8..028664f5bba 100644 --- a/app/views/projects/builds/_table.html.haml +++ b/app/views/projects/builds/_table.html.haml @@ -10,6 +10,7 @@ %tr %th Status %th Build + %th Pipeline - if admin %th Project %th Runner @@ -19,6 +20,6 @@ %th Coverage %th - = render partial: "projects/ci/builds/build", collection: builds, as: :build, locals: { commit_sha: true, ref: true, stage: true, allow_retry: true, coverage: admin || project.build_coverage_enabled?, admin: admin } + = render partial: "projects/ci/builds/build", collection: builds, as: :build, locals: { commit_sha: true, ref: true, pipeline_link: true, stage: true, allow_retry: true, coverage: admin || project.build_coverage_enabled?, admin: admin } = paginate builds, theme: 'gitlab' |