diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-12-18 18:05:52 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-12-18 18:05:52 +0300 |
| commit | 4e8450aff6125ba48e7460db59a6341c9d680ad7 (patch) | |
| tree | 606362a281619bd820099d4ab18cd484eeffedf1 /spec/models | |
| parent | c5a13265f2126919560b18d981754e6eb7f79411 (diff) | |
| parent | 0d1922dd7c08eb098390199af3bc7a3e92812a60 (diff) | |
Merge branch 'force-reload-arguments-2' into 'master'
Passing an argument to force an association to reload is now deprecated
See merge request gitlab-org/gitlab-ce!23894
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/merge_request_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 7fd5307b906..6793d4e8718 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -2092,7 +2092,7 @@ describe MergeRequest do head_commit_sha: commit.sha ) - subject.merge_request_diff(true) + subject.reload_merge_request_diff end end |