Add latest changes from gitlab-org/gitlab@master

4 files changed, 18 insertions, 6 deletions

diff --git a/spec/fixtures/api/schemas/entities/merge_request_noteable.json b/spec/fixtures/api/schemas/entities/merge_request_noteable.json
index 6f3c29b16e9..2e0d7f998a2 100644
--- a/spec/fixtures/api/schemas/entities/merge_request_noteable.json
+++ b/spec/fixtures/api/schemas/entities/merge_request_noteable.json
@@ -24,11 +24,13 @@
       "type": "object",
       "required": [
         "can_create_note",
-        "can_update"
+        "can_update",
+        "can_create_confidential_note"
       ],
       "properties": {
         "can_create_note": { "type": "boolean" },
-        "can_update": { "type": "boolean" }
+        "can_update": { "type": "boolean" },
+        "can_create_confidential_note": { "type": "boolean" }
       },
       "additionalProperties": false
     },
diff --git a/spec/frontend/notes/components/comment_form_spec.js b/spec/frontend/notes/components/comment_form_spec.js
index 500032eac26..b69c604cb54 100644
--- a/spec/frontend/notes/components/comment_form_spec.js
+++ b/spec/frontend/notes/components/comment_form_spec.js
@@ -636,7 +636,7 @@ describe('issue_comment_form component', () => {
         noteableType      | rendered | message
         ${'Issue'}        | ${true}  | ${'render'}
         ${'Epic'}         | ${true}  | ${'render'}
-        ${'MergeRequest'} | ${false} | ${'not render'}
+        ${'MergeRequest'} | ${true}  | ${'render'}
       `(
         'should $message checkbox when noteableType is $noteableType',
         ({ noteableType, rendered }) => {
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 59795059642..8f755e4741b 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -176,10 +176,18 @@ RSpec.describe Note, feature_category: :team_planning do
           expect(subject).to be_valid
         end
 
-        context 'when noteable is not allowed to have confidential notes' do
+        context 'when noteable is a merge request' do
           let_it_be(:noteable) { create(:merge_request) }
 
           it 'can not be set confidential' do
+            expect(subject).to be_valid
+          end
+        end
+
+        context 'when noteable is not allowed to have confidential notes' do
+          let_it_be(:noteable) { create(:snippet) }
+
+          it 'can not be set confidential' do
             expect(subject).not_to be_valid
             expect(subject.errors[:confidential]).to include('can not be set for this resource')
           end
diff --git a/spec/policies/merge_request_policy_spec.rb b/spec/policies/merge_request_policy_spec.rb
index c21e1244402..12b38fe1d93 100644
--- a/spec/policies/merge_request_policy_spec.rb
+++ b/spec/policies/merge_request_policy_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe MergeRequestPolicy do
+RSpec.describe MergeRequestPolicy, feature_category: :code_review_workflow do
   include ExternalAuthorizationServiceHelpers
 
   let_it_be(:guest) { create(:user) }
@@ -23,7 +23,8 @@ RSpec.describe MergeRequestPolicy do
                 create_todo
                 approve_merge_request
                 create_note
-                update_subscription].freeze
+                update_subscription
+                mark_note_as_internal].freeze
 
   shared_examples_for 'a denied user' do
     let(:perms) { permissions(subject, merge_request) }
@@ -47,6 +48,7 @@ RSpec.describe MergeRequestPolicy do
       :create_merge_request_from | false
       :approve_merge_request     | false
       :update_merge_request      | false
+      :mark_note_as_internal     | true
     end
 
     with_them do