Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
b84b32ed
Commit
b84b32ed
authored
Nov 23, 2018
by
Jasper Maes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Passing an argument to force an association to reload is now deprecated
parent
242baf12
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
app/models/merge_request_diff.rb
app/models/merge_request_diff.rb
+2
-1
changelogs/unreleased/force-reload-arguments-1.yml
changelogs/unreleased/force-reload-arguments-1.yml
+5
-0
No files found.
app/models/merge_request_diff.rb
View file @
b84b32ed
...
@@ -313,7 +313,8 @@ class MergeRequestDiff < ActiveRecord::Base
...
@@ -313,7 +313,8 @@ class MergeRequestDiff < ActiveRecord::Base
# merge_request_diff_commits.reload is preferred way to reload associated
# merge_request_diff_commits.reload is preferred way to reload associated
# objects but it returns cached result for some reason in this case
# 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
self
.
commits_count
=
commits
.
size
end
end
...
...
changelogs/unreleased/force-reload-arguments-1.yml
0 → 100644
View file @
b84b32ed
---
title
:
Passing an argument to force an association to reload is now deprecated
merge_request
:
23334
author
:
Jasper Maes
type
:
other
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment