diff options
| author | Jarka Kadlecova <jarka@gitlab.com> | 2017-02-15 14:51:40 +0100 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-02-16 13:27:31 +0100 |
| commit | d89f4d73b9422aac15ee708ca72405f399c7dfa6 (patch) | |
| tree | dc1a1a5909618618ed8d264608f97a6d73afb30d /app/controllers/projects/merge_requests_controller.rb | |
| parent | 88132258d66ca955b0e9bd93d4ee8dc12cc54537 (diff) | |
| download | gitlab-ce-d89f4d73b9422aac15ee708ca72405f399c7dfa6.tar.gz | |
Fix error in MR widget after /merge slash command
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index c3e1760f168..63b5bcbb586 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -369,10 +369,13 @@ class Projects::MergeRequestsController < Projects::ApplicationController end def merge_widget_refresh - if merge_request.in_progress_merge_commit_sha || merge_request.state == 'merged' - @status = :success - elsif merge_request.merge_when_build_succeeds + if merge_request.merge_when_build_succeeds @status = :merge_when_build_succeeds + else + # Only MRs that can be merged end in this action + # MR can be already picked up for merge / merged already or can be waiting for worker to be picked up + # in last case it does not have any special status. Possible error is handled inside widget js function + @status = :success end render 'merge' |