diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-06-21 12:22:40 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-06-21 12:22:40 +0000 |
| commit | e13aeab5a64bdaed74f2fff65d1bb905de4783ee (patch) | |
| tree | df6424d9ec008f5d1da455f8465681b371c4a11e /app/models | |
| parent | 14e35ac9b19d358d84e0cfd167f74036937285b6 (diff) | |
| parent | 3e66795ef1ff1228906239763910b051d8afcc37 (diff) | |
| download | gitlab-ce-e13aeab5a64bdaed74f2fff65d1bb905de4783ee.tar.gz | |
Merge branch 'changes_tab_vue_refactoring' into 'master'
Changes tab VUE refactoring
Closes #42882
See merge request gitlab-org/gitlab-ce!17011
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/concerns/issuable.rb | 4 | ||||
| -rw-r--r-- | app/models/discussion.rb | 4 | ||||
| -rw-r--r-- | app/models/issue.rb | 4 | ||||
| -rw-r--r-- | app/models/merge_request.rb | 4 | ||||
| -rw-r--r-- | app/models/note.rb | 1 |
5 files changed, 17 insertions, 0 deletions
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb index 44150b37708..b93c1145f82 100644 --- a/app/models/concerns/issuable.rb +++ b/app/models/concerns/issuable.rb @@ -107,6 +107,10 @@ module Issuable false end + def etag_caching_enabled? + false + end + def has_multiple_assignees? assignees.count > 1 end diff --git a/app/models/discussion.rb b/app/models/discussion.rb index 92482a1a875..35a0ef00856 100644 --- a/app/models/discussion.rb +++ b/app/models/discussion.rb @@ -17,6 +17,10 @@ class Discussion to: :first_note + def project_id + project&.id + end + def self.build(notes, context_noteable = nil) notes.first.discussion_class(context_noteable).new(notes, context_noteable) end diff --git a/app/models/issue.rb b/app/models/issue.rb index d136700836d..d3df2da14e2 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -308,6 +308,10 @@ class Issue < ActiveRecord::Base end end + def etag_caching_enabled? + true + end + def discussions_rendered_on_frontend? true end diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 4b78ba1029f..3df1130a6e2 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1124,6 +1124,10 @@ class MergeRequest < ActiveRecord::Base true end + def discussions_rendered_on_frontend? + true + end + def update_project_counter_caches Projects::OpenMergeRequestsCountService.new(target_project).refresh_cache end diff --git a/app/models/note.rb b/app/models/note.rb index 41c04ae0571..abc40d9016e 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -384,6 +384,7 @@ class Note < ActiveRecord::Base def expire_etag_cache return unless noteable&.discussions_rendered_on_frontend? + return unless noteable&.etag_caching_enabled? Gitlab::EtagCaching::Store.new.touch(etag_key) end |