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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
940c0508
Commit
940c0508
authored
Jun 14, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check for existing MR only for opened/reopened MR
parent
e7c930a5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
app/models/merge_request.rb
app/models/merge_request.rb
+6
-4
No files found.
app/models/merge_request.rb
View file @
940c0508
...
@@ -92,6 +92,7 @@ class MergeRequest < ActiveRecord::Base
...
@@ -92,6 +92,7 @@ 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
opened?
||
reopened?
similar_mrs
=
self
.
project
.
merge_requests
.
where
(
source_branch:
source_branch
,
target_branch:
target_branch
).
opened
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
similar_mrs
=
similar_mrs
.
where
(
'id not in (?)'
,
self
.
id
)
if
self
.
id
...
@@ -99,6 +100,7 @@ class MergeRequest < ActiveRecord::Base
...
@@ -99,6 +100,7 @@ class MergeRequest < ActiveRecord::Base
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
end
def
reload_code
def
reload_code
self
.
reloaded_commits
self
.
reloaded_commits
...
...
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