diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-29 18:46:08 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-29 18:46:08 +0400 |
commit | 0a1176d62d71d14b4c2f4f470a62ee35ba663415 (patch) | |
tree | 53d39b94117a9cf2df6ad8a7d5866c7cf477cee5 /db | |
parent | 35152e3c562fe916195ac4de9c4f3323093cfb08 (diff) | |
parent | 1ba26184eb3ff6131580dabb655a82090a1220da (diff) |
Merge pull request #7897 from cirosantilli/predictable-merge-requests-dev-seed
Add predictable merge requests on dev seed.
Diffstat (limited to 'db')
-rw-r--r-- | db/fixtures/development/10_merge_requests.rb | 18 |
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 |