Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 5 insertions, 5 deletions

diff --git a/app/policies/note_policy.rb b/app/policies/note_policy.rb
index 9fd95bbe42d..ccc095f37da 100644
--- a/app/policies/note_policy.rb
+++ b/app/policies/note_policy.rb
@@ -18,7 +18,7 @@ class NotePolicy < BasePolicy
 
   condition(:is_visible) { @subject.system_note_visible_for?(@user) }
 
-  condition(:confidential, scope: :subject) { @subject.confidential? }
+  condition(:internal, scope: :subject) { @subject.confidential? }
 
   # if noteable is a work item it needs to check the notes widget availability
   condition(:notes_widget_enabled, scope: :subject) do
@@ -28,7 +28,7 @@ class NotePolicy < BasePolicy
 
   # Should be matched with IssuablePolicy#read_internal_note
   # and EpicPolicy#read_internal_note
-  condition(:can_read_confidential) do
+  condition(:can_read_internal_note) do
     access_level >= Gitlab::Access::REPORTER || admin?
   end
 
@@ -67,11 +67,11 @@ class NotePolicy < BasePolicy
     enable :resolve_note
   end
 
-  rule { can_read_confidential }.policy do
-    enable :mark_note_as_confidential
+  rule { can_read_internal_note }.policy do
+    enable :mark_note_as_internal
   end
 
-  rule { confidential & ~can_read_confidential }.policy do
+  rule { internal & ~can_read_internal_note }.policy do
     prevent :read_note
     prevent :admin_note
     prevent :resolve_note