diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-03 15:09:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-03 15:09:49 +0300 |
| commit | d6533c44860930f866ae5abc967205e8eaf7e00c (patch) | |
| tree | 1412675d5580fdb13c58ff1d7e3000e73bc791bd /app/models/note.rb | |
| parent | 119f0431e47b76f401dbb92d5774bf3380774038 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/note.rb')
| -rw-r--r-- | app/models/note.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index 13aa8fbfbd9..728393a6eca 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -495,7 +495,7 @@ class Note < ApplicationRecord noteable&.expire_note_etag_cache end - def touch(*args) + def touch(*args, **kwargs) # We're not using an explicit transaction here because this would in all # cases result in all future queries going to the primary, even if no writes # are performed. |