Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 1 deletions

diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index f8383b133a0..3e26c8c35b2 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -105,7 +105,8 @@ module Projects
       end
 
       @project.track_project_repository
-      @project.create_project_setting unless @project.project_setting
+
+      create_project_settings
 
       yield if block_given?
 
@@ -122,6 +123,14 @@ module Projects
       create_sast_commit if @initialize_with_sast
     end
 
+    def create_project_settings
+      if Feature.enabled?(:create_project_settings, default_enabled: :yaml)
+        @project.project_setting.save if @project.project_setting.changed?
+      else
+        @project.create_project_setting unless @project.project_setting
+      end
+    end
+
     # Add an authorization for the current user authorizations inline
     # (so they can access the project immediately after this request
     # completes), and any other affected users in the background