summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-08-14 16:21:58 +0000
committerDouwe Maan <douwe@gitlab.com>2017-08-14 16:21:58 +0000
commit7963e2bb55fba009fe0e96c9d705a434df4c6483 (patch)
treeb9df3e7c3c7f0550373086b75493be5771241878 /db
parent62216af8a2f5931f8f860c49b79d5d8b44b43915 (diff)
parentd7e95d77d845baf656d9be4e2cc077f7d426d7a8 (diff)
downloadgitlab-ce-7963e2bb55fba009fe0e96c9d705a434df4c6483.tar.gz
Merge branch '36089-handle-ref-failure-better' into 'master'
Refactor how we fetch ref for merge requests Closes #36089 and #36296 See merge request !13416
Diffstat (limited to 'db')
-rw-r--r--db/fixtures/development/10_merge_requests.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/db/fixtures/development/10_merge_requests.rb b/db/fixtures/development/10_merge_requests.rb
index c304e0706dc..30244ee4431 100644
--- a/db/fixtures/development/10_merge_requests.rb
+++ b/db/fixtures/development/10_merge_requests.rb
@@ -28,6 +28,8 @@ Gitlab::Seeder.quiet do
project = Project.find_by_full_path('gitlab-org/gitlab-test')
+ next if project.empty_repo? # We don't have repository on CI
+
params = {
source_branch: 'feature',
target_branch: 'master',