diff options
Diffstat (limited to 'app/services/projects')
7 files changed, 9 insertions, 9 deletions
diff --git a/app/services/projects/autocomplete_service.rb b/app/services/projects/autocomplete_service.rb index 53bd954eab6..68086f636b7 100644 --- a/app/services/projects/autocomplete_service.rb +++ b/app/services/projects/autocomplete_service.rb @@ -16,7 +16,7 @@ module Projects finder_params[:group_ids] = @project.group.self_and_ancestors.select(:id) if @project.group - MilestonesFinder.new(finder_params).execute.select([:iid, :title]) + MilestonesFinder.new(finder_params).execute.select([:iid, :title, :due_date]) end def merge_requests diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb index 08f569662a8..e3b1fd5f4c0 100644 --- a/app/services/projects/create_service.rb +++ b/app/services/projects/create_service.rb @@ -19,6 +19,8 @@ module Projects @project = Project.new(params) + @project.visibility_level = @project.group.visibility_level unless @project.visibility_level_allowed_by_group? + # If a project is newly created it should have shared runners settings # based on its group having it enabled. This is like the "default value" @project.shared_runners_enabled = false if !params.key?(:shared_runners_enabled) && @project.group && @project.group.shared_runners_setting != 'enabled' diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb index c1501625300..6840c395a76 100644 --- a/app/services/projects/destroy_service.rb +++ b/app/services/projects/destroy_service.rb @@ -107,12 +107,7 @@ module Projects end project.leave_pool_repository - - if Gitlab::Ci::Features.project_transactionless_destroy?(project) - destroy_project_related_records(project) - else - Project.transaction { destroy_project_related_records(project) } - end + destroy_project_related_records(project) end def destroy_project_related_records(project) diff --git a/app/services/projects/group_links/create_service.rb b/app/services/projects/group_links/create_service.rb index 3fcc721fe65..3262839e246 100644 --- a/app/services/projects/group_links/create_service.rb +++ b/app/services/projects/group_links/create_service.rb @@ -23,7 +23,7 @@ module Projects private def setup_authorizations(group, group_access = nil) - if Feature.enabled?(:specialized_project_authorization_project_share_worker) + if Feature.enabled?(:specialized_project_authorization_project_share_worker, default_enabled: :yaml) AuthorizedProjectUpdate::ProjectGroupLinkCreateWorker.perform_async( project.id, group.id, group_access) diff --git a/app/services/projects/schedule_bulk_repository_shard_moves_service.rb b/app/services/projects/schedule_bulk_repository_shard_moves_service.rb index 53de9abdb59..98fc2e22967 100644 --- a/app/services/projects/schedule_bulk_repository_shard_moves_service.rb +++ b/app/services/projects/schedule_bulk_repository_shard_moves_service.rb @@ -25,7 +25,7 @@ module Projects override :schedule_bulk_worker_klass def self.schedule_bulk_worker_klass - ::ProjectScheduleBulkRepositoryShardMovesWorker + ::Projects::ScheduleBulkRepositoryShardMovesWorker end end end diff --git a/app/services/projects/update_pages_configuration_service.rb b/app/services/projects/update_pages_configuration_service.rb index 67d388dc8a3..01539d58545 100644 --- a/app/services/projects/update_pages_configuration_service.rb +++ b/app/services/projects/update_pages_configuration_service.rb @@ -11,6 +11,8 @@ module Projects end def execute + return success unless Feature.enabled?(:pages_update_legacy_storage, default_enabled: true) + # If the pages were never deployed, we can't write out the config, as the # directory would not exist. # https://gitlab.com/gitlab-org/gitlab/-/issues/235139 diff --git a/app/services/projects/update_pages_service.rb b/app/services/projects/update_pages_service.rb index 29e92d725e2..2b59fdd539d 100644 --- a/app/services/projects/update_pages_service.rb +++ b/app/services/projects/update_pages_service.rb @@ -33,6 +33,7 @@ module Projects @status = create_status @status.enqueue! @status.run! + @status.update_older_statuses_retried! if Feature.enabled?(:ci_fix_commit_status_retried, project, default_enabled: :yaml) raise InvalidStateError, 'missing pages artifacts' unless build.artifacts? raise InvalidStateError, 'build SHA is outdated for this ref' unless latest? |