Prevent same branch in MR seeds

Dmitriy Zaporozhets
1 parent 38d23c0e
Showing 2 changed files with 5 additions and 3 deletions Show diff stats
app/views/merge_requests/show/_commits.html.haml
db/fixtures/development/10_merge_requests.rb
@@ -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, [{
...	...	@@ -22,9 +22,9 @@
22	22	= render "commits/commit", commit: commit
23	23
24	24	- else
25		- %h5
	25	+ %h4.nothing_here_message
26	26	Nothing to merge from
27		- %span.label #{@merge_request.source_branch}
	27	+ %span.label-branch #{@merge_request.source_branch}
28	28	to
29		- %span.label #{@merge_request.target_branch}
	29	+ %span.label-branch #{@merge_request.target_branch}
30	30	%br
...	...
...	...	@@ -14,6 +14,8 @@ Gitlab::Seeder.quiet do
14	14
15	15	branches = project.repository.branch_names.sample(2)
16	16
	17	+ next if branches.uniq.size < 2
	18	+
17	19	user_id = user.id
18	20	MergeRequestObserver.current_user = user
19	21	MergeRequest.seed(:id, [{
...	...