diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-11-08 16:50:15 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-11-08 16:50:15 +0900 |
| commit | 66372ec63ad2c932b47bdfdf82cb14b7ba6fcd83 (patch) | |
| tree | c576b15b6ac701649045b868ac18e0bc01d3f7f0 | |
| parent | a979153b6469d328622e8d7ad2b286c6330e1520 (diff) | |
| download | gitlab-ce-fix/sm/31402-consider-moving-mergerequestpresenter-ci_status-logic-to-detailed-ci-cd-statuses.tar.gz | |
Consider moving MergeRequestPresenter#ci_status logic to detailed CI/CD statusesfix/sm/31402-consider-moving-mergerequestpresenter-ci_status-logic-to-detailed-ci-cd-statuses
| -rw-r--r-- | app/presenters/merge_request_presenter.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/presenters/merge_request_presenter.rb b/app/presenters/merge_request_presenter.rb index a25882cbb62..cd4932bcf5f 100644 --- a/app/presenters/merge_request_presenter.rb +++ b/app/presenters/merge_request_presenter.rb @@ -8,10 +8,7 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated def ci_status if pipeline - status = pipeline.status - status = "success_with_warnings" if pipeline.success? && pipeline.has_warnings? - - status || "preparing" + pipeline.detailed_status(current_user).group else ci_service = source_project.try(:ci_service) ci_service&.commit_status(diff_head_sha, source_branch) |