diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-30 11:09:40 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-30 11:09:40 +0000 |
| commit | 21b90ef8668ef888ff64e5a0f1a9c1b26ff0fccc (patch) | |
| tree | e3a420a68baf0f210963d6b26435f180154d8ad0 /app/views/projects | |
| parent | 50a410a977877dd44b1eaa078974c3a11ffd7475 (diff) | |
| parent | a49e9949c6bc474c8bfd4016d9c6c3b59776772f (diff) | |
| download | gitlab-ce-21b90ef8668ef888ff64e5a0f1a9c1b26ff0fccc.tar.gz | |
Merge branch 'fix/rename-merge-request-head-pipeline' into 'master'
Rename `MergeRequest#pipeline` to `head_pipeline`
## What does this MR do?
This MR renames `MergeRequest#pipeline` to `MergeRequest#head_pipeline`
## Does this MR meet the acceptance criteria?
- [x] All builds are passing
## What are the relevant issue numbers?
Closes #24810
See merge request !7783
Diffstat (limited to 'app/views/projects')
3 files changed, 6 insertions, 6 deletions
diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml index 747bfa554cb..d48923b422a 100644 --- a/app/views/projects/issues/_merge_requests.html.haml +++ b/app/views/projects/issues/_merge_requests.html.haml @@ -2,12 +2,12 @@ %h2.merge-requests-title = pluralize(@merge_requests.count, 'Related Merge Request') %ul.unstyled-list.related-merge-requests - - has_any_ci = @merge_requests.any?(&:pipeline) + - has_any_ci = @merge_requests.any?(&:head_pipeline) - @merge_requests.each do |merge_request| %li %span.merge-request-ci-status - - if merge_request.pipeline - = render_pipeline_status(merge_request.pipeline) + - if merge_request.head_pipeline + = render_pipeline_status(merge_request.head_pipeline) - elsif has_any_ci = icon('blank fw') %span.merge-request-id diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 9ffcc48eb80..fa189ae62d8 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -15,9 +15,9 @@ = icon('ban') CLOSED - - if merge_request.pipeline + - if merge_request.head_pipeline %li - = render_pipeline_status(merge_request.pipeline) + = render_pipeline_status(merge_request.head_pipeline) - if merge_request.open? && merge_request.broken? %li diff --git a/app/views/projects/merge_requests/widget/_show.html.haml b/app/views/projects/merge_requests/widget/_show.html.haml index 608fdf1c5f5..a8918c85dde 100644 --- a/app/views/projects/merge_requests/widget/_show.html.haml +++ b/app/views/projects/merge_requests/widget/_show.html.haml @@ -14,7 +14,7 @@ ci_status_url: "#{ci_status_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}", ci_environments_status_url: "#{ci_environments_status_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}", gitlab_icon: "#{asset_path 'gitlab_logo.png'}", - ci_status: "#{@merge_request.pipeline ? @merge_request.pipeline.status : ''}", + ci_status: "#{@merge_request.head_pipeline ? @merge_request.head_pipeline.status : ''}", ci_message: { normal: "Build {{status}} for \"{{title}}\"", preparing: "{{status}} build for \"{{title}}\"" |