Prevent same branch in MR seeds
This commit is contained in:
parent
38d23c0e5f
commit
362d82d10e
|
@ -22,9 +22,9 @@
|
|||
= render "commits/commit", commit: commit
|
||||
|
||||
- else
|
||||
%h5
|
||||
%h4.nothing_here_message
|
||||
Nothing to merge from
|
||||
%span.label #{@merge_request.source_branch}
|
||||
%span.label-branch #{@merge_request.source_branch}
|
||||
to
|
||||
%span.label #{@merge_request.target_branch}
|
||||
%span.label-branch #{@merge_request.target_branch}
|
||||
%br
|
||||
|
|
|
@ -14,6 +14,8 @@ Gitlab::Seeder.quiet do
|
|||
|
||||
branches = project.repository.branch_names.sample(2)
|
||||
|
||||
next if branches.uniq.size < 2
|
||||
|
||||
user_id = user.id
|
||||
MergeRequestObserver.current_user = user
|
||||
MergeRequest.seed(:id, [{
|
||||
|
|
Loading…
Reference in New Issue