Add latest changes from gitlab-org/gitlab@master

2 files changed, 22 insertions, 2 deletions

diff --git a/spec/lib/gitlab/checks/changes_access_spec.rb b/spec/lib/gitlab/checks/changes_access_spec.rb
index 60118823b5a..552afcdb180 100644
--- a/spec/lib/gitlab/checks/changes_access_spec.rb
+++ b/spec/lib/gitlab/checks/changes_access_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Checks::ChangesAccess do
+RSpec.describe Gitlab::Checks::ChangesAccess, feature_category: :source_code_management do
   include_context 'changes access checks context'
 
   subject { changes_access }
@@ -47,6 +47,16 @@ RSpec.describe Gitlab::Checks::ChangesAccess do
       expect(subject.commits).to match_array([])
     end
 
+    context 'when change is for notes ref' do
+      let(:changes) do
+        [{ oldrev: oldrev, newrev: newrev, ref: 'refs/notes/commit' }]
+      end
+
+      it 'does not return any commits' do
+        expect(subject.commits).to match_array([])
+      end
+    end
+
     context 'when changes contain empty revisions' do
       let(:expected_commit) { instance_double(Commit) }
 
diff --git a/spec/lib/gitlab/checks/diff_check_spec.rb b/spec/lib/gitlab/checks/diff_check_spec.rb
index 6b45b8d4628..0845c746545 100644
--- a/spec/lib/gitlab/checks/diff_check_spec.rb
+++ b/spec/lib/gitlab/checks/diff_check_spec.rb
@@ -2,10 +2,20 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Checks::DiffCheck do
+RSpec.describe Gitlab::Checks::DiffCheck, feature_category: :source_code_management do
   include_context 'change access checks context'
 
   describe '#validate!' do
+    context 'when ref is not tag or branch ref' do
+      let(:ref) { 'refs/notes/commit' }
+
+      it 'does not call find_changed_paths' do
+        expect(project.repository).not_to receive(:find_changed_paths)
+
+        subject.validate!
+      end
+    end
+
     context 'when commits is empty' do
       it 'does not call find_changed_paths' do
         expect(project.repository).not_to receive(:find_changed_paths)