BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
a59fe739
Commit
a59fe739
authored
Jun 14, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
IMprove MR validation logic
parent
977146f5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
merge_request.rb
app/models/merge_request.rb
+4
-1
No files found.
app/models/merge_request.rb
View file @
a59fe739
...
@@ -92,7 +92,10 @@ class MergeRequest < ActiveRecord::Base
...
@@ -92,7 +92,10 @@ class MergeRequest < ActiveRecord::Base
errors
.
add
:branch_conflict
,
"You can not use same branch for source and target branches"
errors
.
add
:branch_conflict
,
"You can not use same branch for source and target branches"
end
end
if
self
.
project
.
merge_requests
.
where
(
source_branch:
source_branch
,
target_branch:
target_branch
).
opened
.
any?
similar_mrs
=
self
.
project
.
merge_requests
.
where
(
source_branch:
source_branch
,
target_branch:
target_branch
).
opened
similar_mrs
=
similar_mrs
.
where
(
'id not in (?)'
,
self
.
id
)
if
self
.
id
if
similar_mrs
.
any?
errors
.
add
:base
,
"There is already an open merge request for this branches"
errors
.
add
:base
,
"There is already an open merge request for this branches"
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