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

2 files changed, 16 insertions, 10 deletions

diff --git a/app/services/projects/fork_service.rb b/app/services/projects/fork_service.rb
index fd9b64a4ee0..3cee1b5975a 100644
--- a/app/services/projects/fork_service.rb
+++ b/app/services/projects/fork_service.rb
@@ -34,8 +34,9 @@ module Projects
       new_project = CreateService.new(current_user, new_fork_params).execute
       return new_project unless new_project.persisted?
 
-      builds_access_level = @project.project_feature.builds_access_level
-      new_project.project_feature.update(builds_access_level: builds_access_level)
+      new_project.project_feature.update!(
+        @project.project_feature.slice(ProjectFeature::FEATURES.map { |f| "#{f}_access_level" })
+      )
 
       new_project
     end
diff --git a/spec/services/projects/fork_service_spec.rb b/spec/services/projects/fork_service_spec.rb
index 276656656ec..d710e4a777f 100644
--- a/spec/services/projects/fork_service_spec.rb
+++ b/spec/services/projects/fork_service_spec.rb
@@ -184,14 +184,6 @@ RSpec.describe Projects::ForkService do
         end
       end
 
-      context 'GitLab CI is enabled' do
-        it "forks and enables CI for fork" do
-          @from_project.enable_ci
-          @to_project = fork_project(@from_project, @to_user, using_service: true)
-          expect(@to_project.builds_enabled?).to be_truthy
-        end
-      end
-
       context "CI/CD settings" do
         let(:to_project) { fork_project(@from_project, @to_user, using_service: true) }
 
@@ -366,6 +358,19 @@ RSpec.describe Projects::ForkService do
 
         expect(forked_project.visibility_level).to eq(Gitlab::VisibilityLevel::PRIVATE)
       end
+
+      it 'copies project features visibility settings to the fork', :aggregate_failures do
+        attrs = ProjectFeature::FEATURES.to_h do |f|
+          ["#{f}_access_level", ProjectFeature::PRIVATE]
+        end
+
+        public_project.project_feature.update!(attrs)
+
+        user = create(:user, developer_projects: [public_project])
+        forked_project = described_class.new(public_project, user).execute
+
+        expect(forked_project.project_feature.slice(attrs.keys)).to eq(attrs)
+      end
     end
   end