diff options
| author | Jarka Kadlecova <kadlecovaj@gmail.com> | 2016-12-21 11:32:37 +0100 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-01-11 08:48:07 -0500 |
| commit | aa934c7469372cac7b8cd10b49761d90d8e367fa (patch) | |
| tree | 23030a57551efe5340fa44b65241911f6cd0ab44 /app/controllers/projects/merge_requests_controller.rb | |
| parent | 7ab3dd4b302a85c1b005e9ef290ebac631cda673 (diff) | |
| download | gitlab-ce-aa934c7469372cac7b8cd10b49761d90d8e367fa.tar.gz | |
refresh merge widget after using /merge command
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 6004e7d7115..72dcf020c9f 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -347,6 +347,16 @@ class Projects::MergeRequestsController < Projects::ApplicationController end end + def merge_widget_refresh + if merge_request.in_progress_merge_commit_sha + @status = :success + elsif merge_request.merge_when_build_succeeds + @status = :merge_when_build_succeeds + end + + render 'merge' + end + def branch_from # This is always source @source_project = @merge_request.nil? ? @project : @merge_request.source_project |