diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2018-06-05 14:43:57 +0300 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2018-06-06 01:18:40 +0300 |
| commit | d87552a8d6c4de691bf14971858ba5841f37045d (patch) | |
| tree | f3b6e0c3b7bdf4e940d5d5974fe636c37a5ccb7b | |
| parent | eb94d36d23025956832129525a2b3a424a57ffd7 (diff) | |
Rename #check_if_can_be_merged -> #mark_merge_request_mergeable
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 22319bf8738..28f1acf5fc4 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -29,11 +29,11 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo def show validates_merge_request - check_if_can_be_merged # Return if the response has already been rendered return if response_body close_merge_request_if_no_source_project + mark_merge_request_mergeable respond_to do |format| format.html do @@ -269,7 +269,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo private - def check_if_can_be_merged + def mark_merge_request_mergeable @merge_request.check_if_can_be_merged end |