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
Tatuya Kamada
gitlab-ce
Commits
0c73e666
Commit
0c73e666
authored
May 12, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Specify error codes for merge api
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
fe6d3922
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
9 deletions
+12
-9
lib/api/merge_requests.rb
lib/api/merge_requests.rb
+12
-9
No files found.
lib/api/merge_requests.rb
View file @
0c73e666
...
@@ -130,22 +130,25 @@ module API
...
@@ -130,22 +130,25 @@ module API
end
end
if
can?
(
current_user
,
action
,
project
)
if
can?
(
current_user
,
action
,
project
)
# Check if MR can be merged by GitLab
if
merge_request
.
unchecked?
if
merge_request
.
unchecked?
merge_request
.
check_if_can_be_merged
merge_request
.
check_if_can_be_merged
end
end
if
merge_request
.
open?
&&
merge_request
.
can_be_merged?
if
merge_request
.
open?
merge_request
.
automerge!
(
current_user
,
params
[
:merge_commit_message
]
||
merge_request
.
merge_commit_message
)
if
merge_request
.
can_be_merged?
merge_request
.
automerge!
(
current_user
,
params
[
:merge_commit_message
]
||
merge_request
.
merge_commit_message
)
# return success
else
render_api_error!
(
'Branch cannot be merged'
,
405
)
end
else
else
# Merge request can not be merged
# Checkif can be merged
# because it is already closed/merged
not_allowed!
end
end
else
else
# not allowed
# Merge request can not be merged
# because user dont have permissions to push into target branch
unauthorized!
end
end
end
end
...
...
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