diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-27 09:09:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-27 09:09:45 +0300 |
| commit | f3197dab7ff4b138d756290e9edcc4d829a6eb6e (patch) | |
| tree | b8a3134b9d2536381796fa26f4ab02fdb1ed9b91 /spec/factories/merge_requests.rb | |
| parent | 427879bb37f843a577b07eb9fb2c83537f8c3c4b (diff) | |
Add latest changes from gitlab-org/gitlab@master
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 fce44c2cee0..0aab41df90b 100644 --- a/spec/factories/merge_requests.rb +++ b/spec/factories/merge_requests.rb @@ -279,7 +279,7 @@ FactoryBot.define do trait :with_merge_request_pipeline do transient do - merge_sha { 'test-merge-sha' } + merge_sha { 'mergesha' } source_sha { source_branch_sha } target_sha { target_branch_sha } end |