Automatic merge of gitlab-org/gitlab master

app/controllers/repositories/git_http_controller.rb

@@ -84,11 +84,7 @@ module Repositories
 
       return if Feature.enabled?(:disable_git_http_fetch_writes)
 
-      if Feature.enabled?(:project_statistics_sync, project, default_enabled: true)
       Projects::FetchStatisticsIncrementService.new(project).execute
-      else
-        ProjectDailyStatisticsWorker.perform_async(project.id) # rubocop:disable CodeReuse/Worker
-      end
     end
 
     def access

config/feature_flags/development/project_statistics_sync.yml

----
-name: project_statistics_sync
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29636
-rollout_issue_url: 
-milestone: '12.10'
-type: development
-group: group::source code
-default_enabled: true

ee/app/services/security/security_orchestration_policies/project_create_service.rb

@@ -34,7 +34,7 @@ module Security
         }
 
         if protected_branch.present?
-          ProtectedBranch::UpdateService
+          ProtectedBranches::UpdateService
             .new(policy_project, current_user, params)
             .execute(protected_branch)
           return

ee/spec/services/security/security_orchestration_policies/project_create_service_spec.rb

@@ -29,6 +29,48 @@ RSpec.describe Security::SecurityOrchestrationPolicies::ProjectCreateService do
       end
     end
 
+    context 'when protected branch already exists' do
+      let_it_be(:project) { create(:project) }
+      let_it_be(:current_user) { project.owner }
+      let_it_be(:maintainer) { create(:user) }
+
+      before do
+        project.add_maintainer(maintainer)
+
+        allow_next_instance_of(Project) do |instance|
+          allow(instance).to receive_message_chain(:protected_branches, :find_by_name).and_return([ProtectedBranch.new])
+        end
+
+        protected_branch_service = instance_spy(ProtectedBranches::UpdateService)
+        allow(ProtectedBranches::UpdateService).to receive(:new).and_return(protected_branch_service)
+      end
+
+      it 'updates protected branch' do
+        service.execute
+
+        expect(ProtectedBranches::UpdateService).to have_received(:new)
+      end
+    end
+
+    context 'when protected branch does not exist' do
+      let_it_be(:project) { create(:project) }
+      let_it_be(:current_user) { project.owner }
+      let_it_be(:maintainer) { create(:user) }
+
+      before do
+        project.add_maintainer(maintainer)
+
+        protected_branch_service = instance_spy(ProtectedBranches::CreateService)
+        allow(ProtectedBranches::CreateService).to receive(:new).and_return(protected_branch_service)
+      end
+
+      it 'creates protected branch' do
+        service.execute
+
+        expect(ProtectedBranches::CreateService).to have_received(:new)
+      end
+    end
+
     context 'when adding users to security policy project fails' do
       let_it_be(:project) { create(:project) }
       let_it_be(:current_user) { project.owner }

spec/controllers/repositories/git_http_controller_spec.rb

@@ -34,18 +34,6 @@ RSpec.describe Repositories::GitHttpController do
           end
         end
 
-        context 'when project_statistics_sync feature flag is disabled' do
-          before do
-            stub_feature_flags(project_statistics_sync: false, disable_git_http_fetch_writes: false)
-          end
-
-          it 'updates project statistics async for projects' do
-            expect(ProjectDailyStatisticsWorker).to receive(:perform_async)
-
-            send_request
-          end
-        end
-
         it 'updates project statistics sync for projects' do
           stub_feature_flags(disable_git_http_fetch_writes: false)