diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-10-05 10:13:06 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-10-05 10:13:06 +0900 |
| commit | af2c51d7ca73e16cdb9a11fff6d097116c7c5324 (patch) | |
| tree | cd7f07f36e09a357902a262cbb932f25d254a16c /spec/factories/merge_requests.rb | |
| parent | acfe7ec65c75f65f2f87bf3e8598c1725c9150f4 (diff) | |
| parent | f71c497f5da791a35876206255e342a9bb5e49c5 (diff) | |
| download | gitlab-ce-af2c51d7ca73e16cdb9a11fff6d097116c7c5324.tar.gz | |
Merge branch 'master-ce' into scheduled-manual-jobs
Diffstat (limited to 'spec/factories/merge_requests.rb')
| -rw-r--r-- | spec/factories/merge_requests.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb index b8b089b069b..8094c43b065 100644 --- a/spec/factories/merge_requests.rb +++ b/spec/factories/merge_requests.rb @@ -80,7 +80,7 @@ FactoryBot.define do trait :merge_when_pipeline_succeeds do merge_when_pipeline_succeeds true - merge_user author + merge_user { author } end trait :remove_source_branch do |