kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Rename #check_if_can_be_merged -> #mark_merge_request_mergeable

This commit is contained in:
Ash McKenzie 2018-06-05 21:43:57 +10:00
parent eb94d36d23
commit d87552a8d6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/projects/merge_requests_controller.rb
View File

@ -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