Add latest changes from gitlab-org/gitlab@13-10-stable-ee

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/helpers/commits_helper_spec.rb b/spec/helpers/commits_helper_spec.rb
index 397751b07af..2a8e2e04947 100644
--- a/spec/helpers/commits_helper_spec.rb
+++ b/spec/helpers/commits_helper_spec.rb
@@ -257,5 +257,15 @@ RSpec.describe CommitsHelper do
         { id: forked_project.id.to_s, name: forked_project.full_path, refsUrl: refs_project_path(forked_project) }
       ])
     end
+
+    context 'pick_into_project is disabled' do
+      before do
+        stub_feature_flags(pick_into_project: false)
+      end
+
+      it 'does not calculate target projects' do
+        expect(helper.cherry_pick_projects_data(project)).to eq([])
+      end
+    end
   end
 end