diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 15:09:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 15:09:15 +0300 |
| commit | 20d564f1064622ef0623434372ac3ceb03173331 (patch) | |
| tree | 000d95440566cd189ea774168c9756bcc8fc5fae /spec/models/merge_request_spec.rb | |
| parent | 26384c9a61da9922b8fa4b8351d4e42d51661b37 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/merge_request_spec.rb')
| -rw-r--r-- | spec/models/merge_request_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 470b67afe07..08348e3767a 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -1091,8 +1091,8 @@ describe MergeRequest do end describe '#can_remove_source_branch?' do - set(:user) { create(:user) } - set(:merge_request) { create(:merge_request, :simple) } + let_it_be(:user) { create(:user) } + let_it_be(:merge_request, reload: true) { create(:merge_request, :simple) } subject { merge_request } |