diff options
| author | Jarka Kadlecova <jarka@gitlab.com> | 2016-12-30 20:49:59 +0100 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-01-13 09:16:35 -0500 |
| commit | 557a0bf14c79c02c65196ff8f7a2251ecd77073c (patch) | |
| tree | 36cef1d85fbc5541ec15949d5ea42feb8444c6df /app/controllers | |
| parent | aa934c7469372cac7b8cd10b49761d90d8e367fa (diff) | |
| download | gitlab-ce-557a0bf14c79c02c65196ff8f7a2251ecd77073c.tar.gz | |
Address MR comments
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 72dcf020c9f..6d6115413a5 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -348,7 +348,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController end def merge_widget_refresh - if merge_request.in_progress_merge_commit_sha + if merge_request.in_progress_merge_commit_sha || merge_request.state == 'merged' @status = :success elsif merge_request.merge_when_build_succeeds @status = :merge_when_build_succeeds |