Commit d87552a8 authored by Ash McKenzie's avatar Ash McKenzie

Rename #check_if_can_be_merged -> #mark_merge_request_mergeable

parent eb94d36d
...@@ -29,11 +29,11 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo ...@@ -29,11 +29,11 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
def show def show
validates_merge_request validates_merge_request
check_if_can_be_merged
# Return if the response has already been rendered # Return if the response has already been rendered
return if response_body return if response_body
close_merge_request_if_no_source_project close_merge_request_if_no_source_project
mark_merge_request_mergeable
respond_to do |format| respond_to do |format|
format.html do format.html do
...@@ -269,7 +269,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo ...@@ -269,7 +269,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
private private
def check_if_can_be_merged def mark_merge_request_mergeable
@merge_request.check_if_can_be_merged @merge_request.check_if_can_be_merged
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment