diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /app/services/projects/create_service.rb | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
download | gitlab-ce-e8d2c2579383897a1dd7f9debd359abe8ae8373d.tar.gz |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/services/projects/create_service.rb')
-rw-r--r-- | app/services/projects/create_service.rb | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb index 7dd9280e5b1..9a5c260e488 100644 --- a/app/services/projects/create_service.rb +++ b/app/services/projects/create_service.rb @@ -108,11 +108,7 @@ module Projects current_user.invalidate_personal_projects_count - if Feature.enabled?(:projects_post_creation_worker, current_user, default_enabled: :yaml) - Projects::PostCreationWorker.perform_async(@project.id) - else - create_prometheus_service - end + Projects::PostCreationWorker.perform_async(@project.id) create_readme if @initialize_with_readme end @@ -151,7 +147,7 @@ module Projects branch_name: @default_branch.presence || @project.default_branch_or_main, commit_message: 'Initial commit', file_path: 'README.md', - file_content: "# #{@project.name}\n\n#{@project.description}" + file_content: experiment(:new_project_readme_content, namespace: @project.namespace).run_with(@project) } Files::CreateService.new(@project, current_user, commit_attrs).execute @@ -191,25 +187,6 @@ module Projects @project end - # Deprecated: https://gitlab.com/gitlab-org/gitlab/-/issues/326665 - def create_prometheus_service - service = @project.find_or_initialize_service(::PrometheusService.to_param) - - # If the service has already been inserted in the database, that - # means it came from a template, and there's nothing more to do. - return if service.persisted? - - if service.prometheus_available? - service.save! - else - @project.prometheus_service = nil - end - - rescue ActiveRecord::RecordInvalid => e - Gitlab::ErrorTracking.track_exception(e, extra: { project_id: project.id }) - @project.prometheus_service = nil - end - def set_project_name_from_path # if both name and path set - everything is ok return if @project.name.present? && @project.path.present? |