diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2018-11-26 21:15:00 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-11-26 21:15:00 +0000 |
| commit | 7bbcd7b59baa5b442994a28e9cfc5888badc610f (patch) | |
| tree | 137daaa0368b631fb99c28a37c04c9c3aa3ac83b | |
| parent | 95ebdf3053ef9aeba657ff9bf1a5a66b608cc6dc (diff) | |
| parent | b84b32ed3f0d0a5369cd748974a7ac25b26050d8 (diff) | |
| download | gitlab-ce-7bbcd7b59baa5b442994a28e9cfc5888badc610f.tar.gz | |
Merge branch 'force-reload-arguments-1' into 'master'
Rails 5 deprecation: Passing an argument to force an association to reload is now deprecated
See merge request gitlab-org/gitlab-ce!23337
| -rw-r--r-- | app/models/merge_request_diff.rb | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/force-reload-arguments-1.yml | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index 6f1beede6f9..a3029a54604 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -313,7 +313,8 @@ class MergeRequestDiff < ActiveRecord::Base # merge_request_diff_commits.reload is preferred way to reload associated # objects but it returns cached result for some reason in this case - commits = merge_request_diff_commits(true) + # we can circumvent that by specifying that we need an uncached reload + commits = self.class.uncached { merge_request_diff_commits.reload } self.commits_count = commits.size end diff --git a/changelogs/unreleased/force-reload-arguments-1.yml b/changelogs/unreleased/force-reload-arguments-1.yml new file mode 100644 index 00000000000..29f34b8bdbe --- /dev/null +++ b/changelogs/unreleased/force-reload-arguments-1.yml @@ -0,0 +1,5 @@ +--- +title: Passing an argument to force an association to reload is now deprecated +merge_request: 23334 +author: Jasper Maes +type: other |