diff options
Diffstat (limited to 'app/services/projects')
4 files changed, 10 insertions, 12 deletions
diff --git a/app/services/projects/lfs_pointers/lfs_download_link_list_service.rb b/app/services/projects/lfs_pointers/lfs_download_link_list_service.rb index c82ed97203f..c91103f897f 100644 --- a/app/services/projects/lfs_pointers/lfs_download_link_list_service.rb +++ b/app/services/projects/lfs_pointers/lfs_download_link_list_service.rb @@ -95,10 +95,12 @@ module Projects end def request_body(oids) - { + body = { operation: DOWNLOAD_ACTION, objects: oids.map { |oid, size| { oid: oid, size: size } } - }.to_json + } + + Gitlab::Json.dump(body) end def headers diff --git a/app/services/projects/move_users_star_projects_service.rb b/app/services/projects/move_users_star_projects_service.rb index 5490448553f..4f1580c5f53 100644 --- a/app/services/projects/move_users_star_projects_service.rb +++ b/app/services/projects/move_users_star_projects_service.rb @@ -12,8 +12,8 @@ module Projects Project.transaction do user_stars.update_all(project_id: @project.id) - Project.reset_counters @project.id, :users_star_projects - Project.reset_counters source_project.id, :users_star_projects + @project.update(star_count: @project.starrers.with_state(:active).size) + source_project.update(star_count: source_project.starrers.with_state(:active).size) success end diff --git a/app/services/projects/prometheus/alerts/notify_service.rb b/app/services/projects/prometheus/alerts/notify_service.rb index 9f260345937..1e084c0e5eb 100644 --- a/app/services/projects/prometheus/alerts/notify_service.rb +++ b/app/services/projects/prometheus/alerts/notify_service.rb @@ -36,9 +36,9 @@ module Projects truncate_alerts! if max_alerts_exceeded? - alert_responses = process_prometheus_alerts + process_prometheus_alerts - alert_response(alert_responses) + created end def self.processable?(payload) @@ -152,12 +152,6 @@ module Projects .execute end end - - def alert_response(alert_responses) - alerts = alert_responses.flat_map { |resp| resp.payload[:alerts] }.compact - - success(alerts) - end end end end diff --git a/app/services/projects/unlink_fork_service.rb b/app/services/projects/unlink_fork_service.rb index 9eccc16a8b2..898421364db 100644 --- a/app/services/projects/unlink_fork_service.rb +++ b/app/services/projects/unlink_fork_service.rb @@ -60,3 +60,5 @@ module Projects end end end + +Projects::UnlinkForkService.prepend_mod_with('Projects::UnlinkForkService') |