diff options
| -rw-r--r-- | app/views/merge_requests/show/_commits.html.haml | 6 | ||||
| -rw-r--r-- | db/fixtures/development/10_merge_requests.rb | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/views/merge_requests/show/_commits.html.haml b/app/views/merge_requests/show/_commits.html.haml index 5e27b6dc25a..eee786d71ef 100644 --- a/app/views/merge_requests/show/_commits.html.haml +++ b/app/views/merge_requests/show/_commits.html.haml @@ -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 diff --git a/db/fixtures/development/10_merge_requests.rb b/db/fixtures/development/10_merge_requests.rb index 4d0ec1e6da1..d122d96235e 100644 --- a/db/fixtures/development/10_merge_requests.rb +++ b/db/fixtures/development/10_merge_requests.rb @@ -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, [{ |