diff options
author | Rodolfo Santos <rodolfoasantos@gmail.com> | 2016-09-16 08:02:42 -0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-11-04 14:58:40 +0100 |
commit | 1db9f826c16053e32a1d234bf40b2ca399779cdf (patch) | |
tree | 114a255d1269ed0118fa741f6cbbeb113f0de838 /spec/factories/merge_requests.rb | |
parent | a3cc2f1e8dfcfb2f3e181fa570ed2ba245f9a069 (diff) | |
download | gitlab-ce-1db9f826c16053e32a1d234bf40b2ca399779cdf.tar.gz |
Add setting to only allow merge requests to be merged when all discussions are resolved
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec/factories/merge_requests.rb')
-rw-r--r-- | spec/factories/merge_requests.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb index f780e01253c..37eb49c94df 100644 --- a/spec/factories/merge_requests.rb +++ b/spec/factories/merge_requests.rb @@ -68,6 +68,11 @@ FactoryGirl.define do factory :closed_merge_request, traits: [:closed] factory :reopened_merge_request, traits: [:reopened] factory :merge_request_with_diffs, traits: [:with_diffs] + factory :merge_request_with_diff_notes do + after(:create) do |mr| + create(:diff_note_on_merge_request, noteable: mr, project: mr.source_project) + end + end factory :labeled_merge_request do transient do |