diff options
| author | Sam Rose <sam@gitlab.com> | 2016-12-28 11:53:05 -0500 |
|---|---|---|
| committer | Sam Rose <samrose3@gmail.com> | 2017-02-01 22:20:38 -0500 |
| commit | 2916ea82d9e3bdb69e6eeb9544f494d7269214bd (patch) | |
| tree | ba540724f23194e5d1f0bec0f0530dfa0d3882b5 /app/views | |
| parent | 40a824357c700280f3d2f8e2cda2fabc65af7f69 (diff) | |
| download | gitlab-ce-2916ea82d9e3bdb69e6eeb9544f494d7269214bd.tar.gz | |
Update pipeline and commit URL and text on CI status change25811-pipeline-number-and-url-do-not-update-when-new-pipeline-is-triggered
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/merge_requests/widget/_heading.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/widget/_show.html.haml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml index 804a4a2473b..0e3af62ebc2 100644 --- a/app/views/projects/merge_requests/widget/_heading.html.haml +++ b/app/views/projects/merge_requests/widget/_heading.html.haml @@ -10,7 +10,7 @@ = ci_label_for_status(status) for = succeed "." do - = link_to @pipeline.short_sha, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, @pipeline.sha), class: "monospace" + = link_to @pipeline.short_sha, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, @pipeline.sha), class: "monospace js-commit-link" %span.ci-coverage - elsif @merge_request.has_ci? diff --git a/app/views/projects/merge_requests/widget/_show.html.haml b/app/views/projects/merge_requests/widget/_show.html.haml index 38328501ffd..f07e6b3ad54 100644 --- a/app/views/projects/merge_requests/widget/_show.html.haml +++ b/app/views/projects/merge_requests/widget/_show.html.haml @@ -24,6 +24,10 @@ preparing: "{{status}} build", normal: "Build {{status}}" }, + ci_sha: "#{@merge_request.head_pipeline ? @merge_request.head_pipeline.short_sha : ''}", + ci_pipeline: #{@merge_request.head_pipeline.try(:id).to_json}, + commits_path: "#{project_commits_path(@project)}", + pipeline_path: "#{project_pipelines_path(@project)}", pipelines_path: "#{pipelines_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}" }; |