summaryrefslogtreecommitdiff
path: root/db/fixtures
diff options
context:
space:
mode:
authorCiro Santilli <ciro.santilli@gmail.com>2014-09-29 13:55:31 +0200
committerCiro Santilli <ciro.santilli@gmail.com>2014-09-29 13:55:31 +0200
commit1ba26184eb3ff6131580dabb655a82090a1220da (patch)
treeda0a760993c14fb3a39140c4b1aea778ae6e771a /db/fixtures
parent376e004c16510174dd29ab2953ebdbb28ce2e91b (diff)
downloadgitlab-ce-1ba26184eb3ff6131580dabb655a82090a1220da.tar.gz
Add predictable merge requests on dev seed.
Diffstat (limited to 'db/fixtures')
-rw-r--r--db/fixtures/development/10_merge_requests.rb18
1 files changed, 18 insertions, 0 deletions
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