Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
d87552a8
Commit
d87552a8
authored
6 years ago
by
Ash McKenzie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename #check_if_can_be_merged -> #mark_merge_request_mergeable
parent
eb94d36d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+2
-2
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
d87552a8
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment