From 1ba26184eb3ff6131580dabb655a82090a1220da Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Mon, 29 Sep 2014 13:55:31 +0200 Subject: Add predictable merge requests on dev seed. --- db/fixtures/development/10_merge_requests.rb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'db') diff --git a/db/fixtures/development/10_merge_requests.rb b/db/fixtures/development/10_merge_requests.rb index 03f8de12985..d89cdd52087 100644 --- a/db/fixtures/development/10_merge_requests.rb +++ b/db/fixtures/development/10_merge_requests.rb @@ -20,4 +20,22 @@ Gitlab::Seeder.quiet do print '.' end end + + project = Project.find_with_namespace('gitlab-org/testme') + + params = { + source_branch: 'feature', + target_branch: 'master', + title: 'Can be automatically merged' + } + MergeRequests::CreateService.new(project, User.admins.first, params).execute + print '.' + + params = { + source_branch: 'feature_conflict', + target_branch: 'feature', + title: 'Cannot be automatically merged' + } + MergeRequests::CreateService.new(project, User.admins.first, params).execute + print '.' end -- cgit v1.2.3