Skip to content

fix(backend): Remove duplicate Press User role (backport #6405)#6429

Open
mergify[bot] wants to merge 1 commit into
masterfrom
mergify/bp/release/2026-W20/pr-6405
Open

fix(backend): Remove duplicate Press User role (backport #6405)#6429
mergify[bot] wants to merge 1 commit into
masterfrom
mergify/bp/release/2026-W20/pr-6405

Conversation

@mergify

@mergify mergify Bot commented May 13, 2026

Copy link
Copy Markdown
Contributor

This is an automatic backport of pull request #6405 done by [Mergify](https://mergify.com).

(cherry picked from commit a1d9ca9)

# Conflicts:
#	press/press/doctype/account_request/account_request.json
#	press/press/doctype/add_on_storage_log/add_on_storage_log.json
#	press/press/doctype/agent_job/agent_job.json
#	press/press/doctype/agent_job_step/agent_job_step.json
#	press/press/doctype/agent_request_failure/agent_request_failure.json
#	press/press/doctype/agent_update/agent_update.json
#	press/press/doctype/agent_update_server/agent_update_server.json
#	press/press/doctype/alertmanager_webhook_log/alertmanager_webhook_log.json
#	press/press/doctype/analytics_server/analytics_server.json
#	press/press/doctype/ansible_console/ansible_console.json
#	press/press/doctype/ansible_console_output/ansible_console_output.json
#	press/press/doctype/ansible_play/ansible_play.json
#	press/press/doctype/ansible_task/ansible_task.json
#	press/press/doctype/app/app.json
#	press/press/doctype/app_group/app_group.json
#	press/press/doctype/app_patch/app_patch.json
#	press/press/doctype/app_release/app_release.json
#	press/press/doctype/app_release_approval_request/app_release_approval_request.json
#	press/press/doctype/app_release_difference/app_release_difference.json
#	press/press/doctype/app_rename/app_rename.json
#	press/press/doctype/app_source/app_source.json
#	press/press/doctype/app_tag/app_tag.json
#	press/press/doctype/audit_log/audit_log.json
#	press/press/doctype/auto_scale_record/auto_scale_record.json
#	press/press/doctype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.json
#	press/press/doctype/backup_restoration_test/backup_restoration_test.json
#	press/press/doctype/balance_transaction/balance_transaction.json
#	press/press/doctype/bastion_server/bastion_server.json
#	press/press/doctype/bench/bench.json
#	press/press/doctype/bench_app/bench_app.json
#	press/press/doctype/bench_get_app_cache/bench_get_app_cache.json
#	press/press/doctype/bench_mount/bench_mount.json
#	press/press/doctype/bench_shell/bench_shell.json
#	press/press/doctype/bench_update/bench_update.json
#	press/press/doctype/bench_update_app/bench_update_app.json
#	press/press/doctype/build_cache_shell/build_cache_shell.json
#	press/press/doctype/build_metric/build_metric.json
#	press/press/doctype/certificate_authority/certificate_authority.json
#	press/press/doctype/cloud_provider/cloud_provider.json
#	press/press/doctype/cluster/cluster.json
#	press/press/doctype/cluster_plan/cluster_plan.json
#	press/press/doctype/code_server/code_server.json
#	press/press/doctype/currency_exchange/currency_exchange.json
#	press/press/doctype/dashboard_banner/dashboard_banner.json
#	press/press/doctype/database_server/database_server.json
#	press/press/doctype/deploy/deploy.json
#	press/press/doctype/deploy_candidate/deploy_candidate.json
#	press/press/doctype/deploy_candidate_app/deploy_candidate_app.json
#	press/press/doctype/deploy_candidate_build/deploy_candidate_build.json
#	press/press/doctype/deploy_candidate_build_step/deploy_candidate_build_step.json
#	press/press/doctype/deploy_candidate_difference/deploy_candidate_difference.json
#	press/press/doctype/deploy_candidate_difference_app/deploy_candidate_difference_app.json
#	press/press/doctype/deploy_candidate_package/deploy_candidate_package.json
#	press/press/doctype/disk_performance/disk_performance.json
#	press/press/doctype/downtime_analysis/downtime_analysis.json
#	press/press/doctype/drip_email/drip_email.json
#	press/press/doctype/erpnext_consultant/erpnext_consultant.json
#	press/press/doctype/erpnext_site_settings/erpnext_site_settings.json
#	press/press/doctype/frappe_version/frappe_version.json
#	press/press/doctype/github_webhook_log/github_webhook_log.json
#	press/press/doctype/incident/incident.json
#	press/press/doctype/incident_settings/incident_settings.json
#	press/press/doctype/incident_settings_self_hosted_user/incident_settings_self_hosted_user.json
#	press/press/doctype/incident_settings_user/incident_settings_user.json
#	press/press/doctype/incident_suggestion/incident_suggestion.json
#	press/press/doctype/invoice/fixtures/stripe_payment_intent_succeeded_webhook.json
#	press/press/doctype/invoice/invoice.json
#	press/press/doctype/invoice_discount/invoice_discount.json
#	press/press/doctype/invoice_item/invoice_item.json
#	press/press/doctype/ip_removal_log/ip_removal_log.json
#	press/press/doctype/ip_removal_log_steps/ip_removal_log_steps.json
#	press/press/doctype/log_counter/log_counter.json
#	press/press/doctype/log_server/log_server.json
#	press/press/doctype/logical_replication_backup/logical_replication_backup.json
#	press/press/doctype/logical_replication_step/logical_replication_step.json
#	press/press/doctype/mail_log/mail_log.json
#	press/press/doctype/malware_scan/malware_scan.json
#	press/press/doctype/managed_database_service/managed_database_service.json
#	press/press/doctype/mariadb_binlog/mariadb_binlog.json
#	press/press/doctype/mariadb_stalk/mariadb_stalk.json
#	press/press/doctype/mariadb_upgrade/mariadb_upgrade.json
#	press/press/doctype/mariadb_upgrade_step/mariadb_upgrade_step.json
#	press/press/doctype/mariadb_variable/mariadb_variable.json
#	press/press/doctype/marketplace_app/marketplace_app.json
#	press/press/doctype/marketplace_app_category/marketplace_app_category.json
#	press/press/doctype/monitor_server/monitor_server.json
#	press/press/doctype/mpesa_payment_record/mpesa_payment_record.json
#	press/press/doctype/mpesa_request_log/mpesa_request_log.json
#	press/press/doctype/mpesa_setup/mpesa_setup.json
#	press/press/doctype/nat_failover/nat_failover.json
#	press/press/doctype/nat_failover_steps/nat_failover_steps.json
#	press/press/doctype/nat_server/nat_server.json
#	press/press/doctype/new_bench_queue/new_bench_queue.json
#	press/press/doctype/nfs_server/nfs_server.json
#	press/press/doctype/nfs_volume_attachment/nfs_volume_attachment.json
#	press/press/doctype/nfs_volume_attachment_step/nfs_volume_attachment_step.json
#	press/press/doctype/nfs_volume_detachment/nfs_volume_detachment.json
#	press/press/doctype/nfs_volume_detachment_step/nfs_volume_detachment_step.json
#	press/press/doctype/oauth_domain_mapping/oauth_domain_mapping.json
#	press/press/doctype/on_prem_failover/on_prem_failover.json
#	press/press/doctype/partner_payment_payout/partner_payment_payout.json
#	press/press/doctype/partner_payment_payout_item/partner_payment_payout_item.json
#	press/press/doctype/payment_dispute/payment_dispute.json
#	press/press/doctype/payment_gateway/payment_gateway.json
#	press/press/doctype/payment_partner_transaction/payment_partner_transaction.json
#	press/press/doctype/payout_order/payout_order.json
#	press/press/doctype/payout_order_item/payout_order_item.json
#	press/press/doctype/physical_backup_group/physical_backup_group.json
#	press/press/doctype/physical_backup_restoration/physical_backup_restoration.json
#	press/press/doctype/physical_backup_restoration_step/physical_backup_restoration_step.json
#	press/press/doctype/physical_restoration_test/physical_restoration_test.json
#	press/press/doctype/plan_change/plan_change.json
#	press/press/doctype/press_feedback/press_feedback.json
#	press/press/doctype/press_job/press_job.json
#	press/press/doctype/press_job_step/press_job_step.json
#	press/press/doctype/press_job_type_step/press_job_type_step.json
#	press/press/doctype/press_notification/press_notification.json
#	press/press/doctype/press_role/press_role.json
#	press/press/doctype/press_role_permission/press_role_permission.json
#	press/press/doctype/press_settings/press_settings.json
#	press/press/doctype/press_tag/press_tag.json
#	press/press/doctype/press_webhook/press_webhook.json
#	press/press/doctype/press_webhook_attempt/press_webhook_attempt.json
#	press/press/doctype/press_webhook_log/press_webhook_log.json
#	press/press/doctype/prometheus_alert_rule/prometheus_alert_rule.json
#	press/press/doctype/proxy_failover/proxy_failover.json
#	press/press/doctype/proxy_failover_steps/proxy_failover_steps.json
#	press/press/doctype/proxy_server/proxy_server.json
#	press/press/doctype/razorpay_mandate/razorpay_mandate.json
#	press/press/doctype/registry_server/registry_server.json
#	press/press/doctype/release_group/release_group.json
#	press/press/doctype/release_group_app/release_group_app.json
#	press/press/doctype/release_group_mount/release_group_mount.json
#	press/press/doctype/release_group_package/release_group_package.json
#	press/press/doctype/release_group_server/release_group_server.json
#	press/press/doctype/release_pipeline/release_pipeline.json
#	press/press/doctype/remote_file/remote_file.json
#	press/press/doctype/remote_operation_log/remote_operation_log.json
#	press/press/doctype/root_domain/root_domain.json
#	press/press/doctype/scale_step/scale_step.json
#	press/press/doctype/scheduled_auto_update_log/scheduled_auto_update_log.json
#	press/press/doctype/security_update/security_update.json
#	press/press/doctype/self_hosted_server/self_hosted_server.json
#	press/press/doctype/self_hosted_site_apps/self_hosted_site_apps.json
#	press/press/doctype/serial_console_log/serial_console_log.json
#	press/press/doctype/server/scaleway-metal-build-server-raid.json
#	press/press/doctype/server/server.json
#	press/press/doctype/server_activity/server_activity.json
#	press/press/doctype/server_firewall/server_firewall.json
#	press/press/doctype/server_mount/server_mount.json
#	press/press/doctype/server_plan/server_plan.json
#	press/press/doctype/server_plan_type/server_plan_type.json
#	press/press/doctype/server_snapshot/server_snapshot.json
#	press/press/doctype/server_snapshot_plan/server_snapshot_plan.json
#	press/press/doctype/server_snapshot_recovery/server_snapshot_recovery.json
#	press/press/doctype/server_snapshot_site_recovery/server_snapshot_site_recovery.json
#	press/press/doctype/server_storage_plan/server_storage_plan.json
#	press/press/doctype/silenced_alert/silenced_alert.json
#	press/press/doctype/site/site.json
#	press/press/doctype/site_action/site_action.json
#	press/press/doctype/site_action_step/site_action_step.json
#	press/press/doctype/site_activity/site_activity.json
#	press/press/doctype/site_analytics/site_analytics.json
#	press/press/doctype/site_analytics_active/site_analytics_active.json
#	press/press/doctype/site_analytics_user/site_analytics_user.json
#	press/press/doctype/site_backup/site_backup.json
#	press/press/doctype/site_config_key_blacklist/site_config_key_blacklist.json
#	press/press/doctype/site_database_table_permission/site_database_table_permission.json
#	press/press/doctype/site_database_user/site_database_user.json
#	press/press/doctype/site_domain/site_domain.json
#	press/press/doctype/site_group_deploy/site_group_deploy.json
#	press/press/doctype/site_migration/site_migration.json
#	press/press/doctype/site_migration_step/site_migration_step.json
#	press/press/doctype/site_partner_lead/site_partner_lead.json
#	press/press/doctype/site_plan/site_plan.json
#	press/press/doctype/site_plan_change/site_plan_change.json
#	press/press/doctype/site_replication/site_replication.json
#	press/press/doctype/site_update/site_update.json
#	press/press/doctype/site_user_session/site_user_session.json
#	press/press/doctype/sql_playground_log/sql_playground_log.json
#	press/press/doctype/ssh_certificate/ssh_certificate.json
#	press/press/doctype/ssh_certificate_authority/ssh_certificate_authority.json
#	press/press/doctype/storage_integration_bucket/storage_integration_bucket.json
#	press/press/doctype/storage_integration_subscription/storage_integration_subscription.json
#	press/press/doctype/stripe_micro_charge_record/stripe_micro_charge_record.json
#	press/press/doctype/stripe_payment_method/stripe_payment_method.json
#	press/press/doctype/stripe_webhook_log/stripe_webhook_log.json
#	press/press/doctype/subscription/subscription.json
#	press/press/doctype/support_access/support_access.json
#	press/press/doctype/team/team.json
#	press/press/doctype/team_change/team_change.json
#	press/press/doctype/team_deletion_request/team_deletion_request.json
#	press/press/doctype/team_member_impersonation/team_member_impersonation.json
#	press/press/doctype/telegram_message/telegram_message.json
#	press/press/doctype/tls_certificate/tls_certificate.json
#	press/press/doctype/trace_server/trace_server.json
#	press/press/doctype/usage_record/usage_record.json
#	press/press/doctype/user_2fa/user_2fa.json
#	press/press/doctype/user_ssh_certificate/user_ssh_certificate.json
#	press/press/doctype/user_ssh_key/user_ssh_key.json
#	press/press/doctype/version_upgrade/version_upgrade.json
#	press/press/doctype/virtual_disk_snapshot/virtual_disk_snapshot.json
#	press/press/doctype/virtual_machine/virtual_machine.json
#	press/press/doctype/virtual_machine_image/virtual_machine_image.json
#	press/press/doctype/virtual_machine_image_volume/virtual_machine_image_volume.json
#	press/press/doctype/virtual_machine_volume/virtual_machine_volume.json
#	press/press/doctype/wireguard_peer/wireguard_peer.json
#	press/press/doctype/yanked_app_release/yanked_app_release.json
#	press/workflow_engine/doctype/press_workflow/press_workflow.json
#	press/workflow_engine/doctype/press_workflow_task/press_workflow_task.json
@mergify mergify Bot requested a review from balamurali27 as a code owner May 13, 2026 12:49
@mergify mergify Bot added the conflicts label May 13, 2026
@mergify

mergify Bot commented May 13, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of a1d9ca9 has failed:

On branch mergify/bp/release/2026-W20/pr-6405
Your branch is up to date with 'origin/release/2026-W20'.

You are currently cherry-picking commit a1d9ca95e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .secrets.baseline
	modified:   press/experimental/doctype/referral_bonus/referral_bonus.json
	modified:   press/incident_management/doctype/action_step/action_step.json
	modified:   press/incident_management/doctype/incident_investigator/incident_investigator.json
	modified:   press/incident_management/doctype/incident_pattern/incident_pattern.json
	modified:   press/incident_management/doctype/incident_pattern_investigation/incident_pattern_investigation.json
	modified:   press/incident_management/doctype/investigation_step/investigation_step.json
	modified:   press/infrastructure/doctype/arm_build_record/arm_build_record.json
	modified:   press/infrastructure/doctype/arm_docker_image/arm_docker_image.json
	modified:   press/infrastructure/doctype/ssh_access_audit/ssh_access_audit.json
	modified:   press/infrastructure/doctype/ssh_access_audit_host/ssh_access_audit_host.json
	modified:   press/infrastructure/doctype/ssh_access_audit_violation/ssh_access_audit_violation.json
	modified:   press/infrastructure/doctype/virtual_disk_resize/virtual_disk_resize.json
	modified:   press/infrastructure/doctype/virtual_machine_migration/virtual_machine_migration.json
	modified:   press/infrastructure/doctype/virtual_machine_migration_bind_mount/virtual_machine_migration_bind_mount.json
	modified:   press/infrastructure/doctype/virtual_machine_migration_mount/virtual_machine_migration_mount.json
	modified:   press/infrastructure/doctype/virtual_machine_migration_step/virtual_machine_migration_step.json
	modified:   press/infrastructure/doctype/virtual_machine_migration_volume/virtual_machine_migration_volume.json
	modified:   press/infrastructure/doctype/virtual_machine_replacement/virtual_machine_replacement.json
	modified:   press/marketplace/doctype/app_plan_version/app_plan_version.json
	modified:   press/marketplace/doctype/app_user_review/app_user_review.json
	modified:   press/marketplace/doctype/auto_release_team/auto_release_team.json
	modified:   press/marketplace/doctype/developer_review_reply/developer_review_reply.json
	modified:   press/marketplace/doctype/featured_app/featured_app.json
	modified:   press/marketplace/doctype/marketplace_add_on/marketplace_add_on.json
	modified:   press/marketplace/doctype/marketplace_app_audit/marketplace_app_audit.json
	modified:   press/marketplace/doctype/marketplace_app_audit_checks/marketplace_app_audit_checks.json
	modified:   press/marketplace/doctype/marketplace_app_feedback/marketplace_app_feedback.json
	modified:   press/marketplace/doctype/marketplace_app_payment/marketplace_app_payment.json
	modified:   press/marketplace/doctype/marketplace_app_plan/marketplace_app_plan.json
	modified:   press/marketplace/doctype/marketplace_app_plans/marketplace_app_plans.json
	modified:   press/marketplace/doctype/marketplace_app_subscription/marketplace_app_subscription.json
	modified:   press/marketplace/doctype/marketplace_promotional_banner/marketplace_promotional_banner.json
	modified:   press/marketplace/doctype/marketplace_publisher_profile/marketplace_publisher_profile.json
	modified:   press/marketplace/doctype/marketplace_settings/marketplace_settings.json
	modified:   press/partner/doctype/certificate_link_request/certificate_link_request.json
	modified:   press/partner/doctype/lead_followup/lead_followup.json
	modified:   press/partner/doctype/partner_approval_request/partner_approval_request.json
	modified:   press/partner/doctype/partner_audit/partner_audit.json
	modified:   press/partner/doctype/partner_certificate/partner_certificate.json
	modified:   press/partner/doctype/partner_certificate_request/partner_certificate_request.json
	modified:   press/partner/doctype/partner_consent/partner_consent.json
	modified:   press/partner/doctype/partner_lead/partner_lead.json
	modified:   press/partner/doctype/partner_lead_origin/partner_lead_origin.json
	modified:   press/partner/doctype/partner_lead_type/partner_lead_type.json
	modified:   press/partner/doctype/partner_non_conformance/partner_non_conformance.json
	modified:   press/partner/doctype/partner_tier/partner_tier.json
	modified:   press/partner/doctype/territory/territory.json
	modified:   press/press/doctype/bench_shell_log/bench_shell_log.json
	modified:   press/saas/doctype/account_request_rules/account_request_rules.json
	modified:   press/saas/doctype/hybrid_pool_item/hybrid_pool_item.json
	modified:   press/saas/doctype/hybrid_saas_pool/hybrid_saas_pool.json
	modified:   press/saas/doctype/product_trial/product_trial.json
	modified:   press/saas/doctype/product_trial_app/product_trial_app.json
	modified:   press/saas/doctype/product_trial_help_text/product_trial_help_text.json
	modified:   press/saas/doctype/product_trial_request/product_trial_request.json
	modified:   press/saas/doctype/product_trial_signup_field/product_trial_signup_field.json
	modified:   press/saas/doctype/saas_app/saas_app.json
	modified:   press/saas/doctype/saas_app_plan/saas_app_plan.json
	modified:   press/saas/doctype/saas_app_subscription/saas_app_subscription.json
	modified:   press/saas/doctype/saas_app_version/saas_app_version.json
	modified:   press/saas/doctype/saas_feedback/saas_feedback.json
	modified:   press/saas/doctype/saas_pool_rules/saas_pool_rules.json
	modified:   press/saas/doctype/saas_remote_login/saas_remote_login.json
	modified:   press/saas/doctype/saas_settings/saas_settings.json
	modified:   press/saas/doctype/saas_setup_account_generator/saas_setup_account_generator.json
	modified:   press/saas/doctype/saas_signup_generator/saas_signup_generator.json
	modified:   press/saas/doctype/site_access_token/site_access_token.json
	modified:   press/workflow_engine/doctype/press_workflow_kv/press_workflow_kv.json
	modified:   press/workflow_engine/doctype/press_workflow_object/press_workflow_object.json
	modified:   press/workflow_engine/doctype/press_workflow_step/press_workflow_step.json
	modified:   press/workflow_engine/doctype/press_workflow_test/press_workflow_test.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   press/press/doctype/account_request/account_request.json
	both modified:   press/press/doctype/add_on_storage_log/add_on_storage_log.json
	both modified:   press/press/doctype/agent_job/agent_job.json
	both modified:   press/press/doctype/agent_job_step/agent_job_step.json
	both modified:   press/press/doctype/agent_request_failure/agent_request_failure.json
	both modified:   press/press/doctype/agent_update/agent_update.json
	both modified:   press/press/doctype/agent_update_server/agent_update_server.json
	both modified:   press/press/doctype/alertmanager_webhook_log/alertmanager_webhook_log.json
	both modified:   press/press/doctype/analytics_server/analytics_server.json
	both modified:   press/press/doctype/ansible_console/ansible_console.json
	both modified:   press/press/doctype/ansible_console_output/ansible_console_output.json
	both modified:   press/press/doctype/ansible_play/ansible_play.json
	both modified:   press/press/doctype/ansible_task/ansible_task.json
	both modified:   press/press/doctype/app/app.json
	both modified:   press/press/doctype/app_group/app_group.json
	both modified:   press/press/doctype/app_patch/app_patch.json
	both modified:   press/press/doctype/app_release/app_release.json
	both modified:   press/press/doctype/app_release_approval_request/app_release_approval_request.json
	both modified:   press/press/doctype/app_release_difference/app_release_difference.json
	both modified:   press/press/doctype/app_rename/app_rename.json
	both modified:   press/press/doctype/app_source/app_source.json
	both modified:   press/press/doctype/app_tag/app_tag.json
	both modified:   press/press/doctype/audit_log/audit_log.json
	both modified:   press/press/doctype/auto_scale_record/auto_scale_record.json
	both modified:   press/press/doctype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.json
	both modified:   press/press/doctype/backup_restoration_test/backup_restoration_test.json
	both modified:   press/press/doctype/balance_transaction/balance_transaction.json
	both modified:   press/press/doctype/bastion_server/bastion_server.json
	both modified:   press/press/doctype/bench/bench.json
	both modified:   press/press/doctype/bench_app/bench_app.json
	both modified:   press/press/doctype/bench_get_app_cache/bench_get_app_cache.json
	both modified:   press/press/doctype/bench_mount/bench_mount.json
	both modified:   press/press/doctype/bench_shell/bench_shell.json
	both modified:   press/press/doctype/bench_update/bench_update.json
	both modified:   press/press/doctype/bench_update_app/bench_update_app.json
	both modified:   press/press/doctype/build_cache_shell/build_cache_shell.json
	both modified:   press/press/doctype/build_metric/build_metric.json
	both modified:   press/press/doctype/certificate_authority/certificate_authority.json
	both modified:   press/press/doctype/cloud_provider/cloud_provider.json
	both modified:   press/press/doctype/cluster/cluster.json
	both modified:   press/press/doctype/cluster_plan/cluster_plan.json
	both modified:   press/press/doctype/code_server/code_server.json
	both modified:   press/press/doctype/currency_exchange/currency_exchange.json
	both modified:   press/press/doctype/dashboard_banner/dashboard_banner.json
	both modified:   press/press/doctype/database_server/database_server.json
	both modified:   press/press/doctype/deploy/deploy.json
	both modified:   press/press/doctype/deploy_candidate/deploy_candidate.json
	both modified:   press/press/doctype/deploy_candidate_app/deploy_candidate_app.json
	both modified:   press/press/doctype/deploy_candidate_build/deploy_candidate_build.json
	both modified:   press/press/doctype/deploy_candidate_build_step/deploy_candidate_build_step.json
	both modified:   press/press/doctype/deploy_candidate_difference/deploy_candidate_difference.json
	both modified:   press/press/doctype/deploy_candidate_difference_app/deploy_candidate_difference_app.json
	both modified:   press/press/doctype/deploy_candidate_package/deploy_candidate_package.json
	both modified:   press/press/doctype/disk_performance/disk_performance.json
	both modified:   press/press/doctype/downtime_analysis/downtime_analysis.json
	both modified:   press/press/doctype/drip_email/drip_email.json
	both modified:   press/press/doctype/erpnext_consultant/erpnext_consultant.json
	both modified:   press/press/doctype/erpnext_site_settings/erpnext_site_settings.json
	both modified:   press/press/doctype/frappe_version/frappe_version.json
	both modified:   press/press/doctype/github_webhook_log/github_webhook_log.json
	both modified:   press/press/doctype/incident/incident.json
	both modified:   press/press/doctype/incident_settings/incident_settings.json
	both modified:   press/press/doctype/incident_settings_self_hosted_user/incident_settings_self_hosted_user.json
	both modified:   press/press/doctype/incident_settings_user/incident_settings_user.json
	both modified:   press/press/doctype/incident_suggestion/incident_suggestion.json
	both modified:   press/press/doctype/invoice/fixtures/stripe_payment_intent_succeeded_webhook.json
	both modified:   press/press/doctype/invoice/invoice.json
	both modified:   press/press/doctype/invoice_discount/invoice_discount.json
	both modified:   press/press/doctype/invoice_item/invoice_item.json
	both modified:   press/press/doctype/ip_removal_log/ip_removal_log.json
	both modified:   press/press/doctype/ip_removal_log_steps/ip_removal_log_steps.json
	both modified:   press/press/doctype/log_counter/log_counter.json
	both modified:   press/press/doctype/log_server/log_server.json
	both modified:   press/press/doctype/logical_replication_backup/logical_replication_backup.json
	both modified:   press/press/doctype/logical_replication_step/logical_replication_step.json
	both modified:   press/press/doctype/mail_log/mail_log.json
	both modified:   press/press/doctype/malware_scan/malware_scan.json
	both modified:   press/press/doctype/managed_database_service/managed_database_service.json
	both modified:   press/press/doctype/mariadb_binlog/mariadb_binlog.json
	both modified:   press/press/doctype/mariadb_stalk/mariadb_stalk.json
	both modified:   press/press/doctype/mariadb_upgrade/mariadb_upgrade.json
	both modified:   press/press/doctype/mariadb_upgrade_step/mariadb_upgrade_step.json
	both modified:   press/press/doctype/mariadb_variable/mariadb_variable.json
	both modified:   press/press/doctype/marketplace_app/marketplace_app.json
	both modified:   press/press/doctype/marketplace_app_category/marketplace_app_category.json
	both modified:   press/press/doctype/monitor_server/monitor_server.json
	both modified:   press/press/doctype/mpesa_payment_record/mpesa_payment_record.json
	both modified:   press/press/doctype/mpesa_request_log/mpesa_request_log.json
	both modified:   press/press/doctype/mpesa_setup/mpesa_setup.json
	both modified:   press/press/doctype/nat_failover/nat_failover.json
	both modified:   press/press/doctype/nat_failover_steps/nat_failover_steps.json
	both modified:   press/press/doctype/nat_server/nat_server.json
	both modified:   press/press/doctype/new_bench_queue/new_bench_queue.json
	both modified:   press/press/doctype/nfs_server/nfs_server.json
	both modified:   press/press/doctype/nfs_volume_attachment/nfs_volume_attachment.json
	both modified:   press/press/doctype/nfs_volume_attachment_step/nfs_volume_attachment_step.json
	both modified:   press/press/doctype/nfs_volume_detachment/nfs_volume_detachment.json
	both modified:   press/press/doctype/nfs_volume_detachment_step/nfs_volume_detachment_step.json
	both modified:   press/press/doctype/oauth_domain_mapping/oauth_domain_mapping.json
	both modified:   press/press/doctype/on_prem_failover/on_prem_failover.json
	both modified:   press/press/doctype/partner_payment_payout/partner_payment_payout.json
	both modified:   press/press/doctype/partner_payment_payout_item/partner_payment_payout_item.json
	both modified:   press/press/doctype/payment_dispute/payment_dispute.json
	both modified:   press/press/doctype/payment_gateway/payment_gateway.json
	both modified:   press/press/doctype/payment_partner_transaction/payment_partner_transaction.json
	both modified:   press/press/doctype/payout_order/payout_order.json
	both modified:   press/press/doctype/payout_order_item/payout_order_item.json
	both modified:   press/press/doctype/physical_backup_group/physical_backup_group.json
	both modified:   press/press/doctype/physical_backup_restoration/physical_backup_restoration.json
	both modified:   press/press/doctype/physical_backup_restoration_step/physical_backup_restoration_step.json
	both modified:   press/press/doctype/physical_restoration_test/physical_restoration_test.json
	both modified:   press/press/doctype/plan_change/plan_change.json
	both modified:   press/press/doctype/press_feedback/press_feedback.json
	both modified:   press/press/doctype/press_job/press_job.json
	both modified:   press/press/doctype/press_job_step/press_job_step.json
	both modified:   press/press/doctype/press_job_type_step/press_job_type_step.json
	both modified:   press/press/doctype/press_notification/press_notification.json
	both modified:   press/press/doctype/press_role/press_role.json
	both modified:   press/press/doctype/press_role_permission/press_role_permission.json
	both modified:   press/press/doctype/press_settings/press_settings.json
	both modified:   press/press/doctype/press_tag/press_tag.json
	both modified:   press/press/doctype/press_webhook/press_webhook.json
	both modified:   press/press/doctype/press_webhook_attempt/press_webhook_attempt.json
	both modified:   press/press/doctype/press_webhook_log/press_webhook_log.json
	both modified:   press/press/doctype/prometheus_alert_rule/prometheus_alert_rule.json
	both modified:   press/press/doctype/proxy_failover/proxy_failover.json
	both modified:   press/press/doctype/proxy_failover_steps/proxy_failover_steps.json
	both modified:   press/press/doctype/proxy_server/proxy_server.json
	both modified:   press/press/doctype/razorpay_mandate/razorpay_mandate.json
	both modified:   press/press/doctype/registry_server/registry_server.json
	both modified:   press/press/doctype/release_group/release_group.json
	both modified:   press/press/doctype/release_group_app/release_group_app.json
	both modified:   press/press/doctype/release_group_mount/release_group_mount.json
	both modified:   press/press/doctype/release_group_package/release_group_package.json
	both modified:   press/press/doctype/release_group_server/release_group_server.json
	both modified:   press/press/doctype/release_pipeline/release_pipeline.json
	both modified:   press/press/doctype/remote_file/remote_file.json
	both modified:   press/press/doctype/remote_operation_log/remote_operation_log.json
	both modified:   press/press/doctype/root_domain/root_domain.json
	both modified:   press/press/doctype/scale_step/scale_step.json
	both modified:   press/press/doctype/scheduled_auto_update_log/scheduled_auto_update_log.json
	both modified:   press/press/doctype/security_update/security_update.json
	both modified:   press/press/doctype/self_hosted_server/self_hosted_server.json
	both modified:   press/press/doctype/self_hosted_site_apps/self_hosted_site_apps.json
	both modified:   press/press/doctype/serial_console_log/serial_console_log.json
	both modified:   press/press/doctype/server/scaleway-metal-build-server-raid.json
	both modified:   press/press/doctype/server/server.json
	both modified:   press/press/doctype/server_activity/server_activity.json
	both modified:   press/press/doctype/server_firewall/server_firewall.json
	both modified:   press/press/doctype/server_mount/server_mount.json
	both modified:   press/press/doctype/server_plan/server_plan.json
	both modified:   press/press/doctype/server_plan_type/server_plan_type.json
	both modified:   press/press/doctype/server_snapshot/server_snapshot.json
	both modified:   press/press/doctype/server_snapshot_plan/server_snapshot_plan.json
	both modified:   press/press/doctype/server_snapshot_recovery/server_snapshot_recovery.json
	both modified:   press/press/doctype/server_snapshot_site_recovery/server_snapshot_site_recovery.json
	both modified:   press/press/doctype/server_storage_plan/server_storage_plan.json
	both modified:   press/press/doctype/silenced_alert/silenced_alert.json
	both modified:   press/press/doctype/site/site.json
	both modified:   press/press/doctype/site_action/site_action.json
	both modified:   press/press/doctype/site_action_step/site_action_step.json
	both modified:   press/press/doctype/site_activity/site_activity.json
	both modified:   press/press/doctype/site_analytics/site_analytics.json
	both modified:   press/press/doctype/site_analytics_active/site_analytics_active.json
	both modified:   press/press/doctype/site_analytics_user/site_analytics_user.json
	both modified:   press/press/doctype/site_backup/site_backup.json
	both modified:   press/press/doctype/site_config_key_blacklist/site_config_key_blacklist.json
	both modified:   press/press/doctype/site_database_table_permission/site_database_table_permission.json
	both modified:   press/press/doctype/site_database_user/site_database_user.json
	both modified:   press/press/doctype/site_domain/site_domain.json
	both modified:   press/press/doctype/site_group_deploy/site_group_deploy.json
	both modified:   press/press/doctype/site_migration/site_migration.json
	both modified:   press/press/doctype/site_migration_step/site_migration_step.json
	both modified:   press/press/doctype/site_partner_lead/site_partner_lead.json
	both modified:   press/press/doctype/site_plan/site_plan.json
	both modified:   press/press/doctype/site_plan_change/site_plan_change.json
	both modified:   press/press/doctype/site_replication/site_replication.json
	both modified:   press/press/doctype/site_update/site_update.json
	both modified:   press/press/doctype/site_user_session/site_user_session.json
	both modified:   press/press/doctype/sql_playground_log/sql_playground_log.json
	both modified:   press/press/doctype/ssh_certificate/ssh_certificate.json
	both modified:   press/press/doctype/ssh_certificate_authority/ssh_certificate_authority.json
	both modified:   press/press/doctype/storage_integration_bucket/storage_integration_bucket.json
	both modified:   press/press/doctype/storage_integration_subscription/storage_integration_subscription.json
	both modified:   press/press/doctype/stripe_micro_charge_record/stripe_micro_charge_record.json
	both modified:   press/press/doctype/stripe_payment_method/stripe_payment_method.json
	both modified:   press/press/doctype/stripe_webhook_log/stripe_webhook_log.json
	both modified:   press/press/doctype/subscription/subscription.json
	both modified:   press/press/doctype/support_access/support_access.json
	both modified:   press/press/doctype/team/team.json
	both modified:   press/press/doctype/team_change/team_change.json
	both modified:   press/press/doctype/team_deletion_request/team_deletion_request.json
	both modified:   press/press/doctype/team_member_impersonation/team_member_impersonation.json
	both modified:   press/press/doctype/telegram_message/telegram_message.json
	both modified:   press/press/doctype/tls_certificate/tls_certificate.json
	both modified:   press/press/doctype/trace_server/trace_server.json
	both modified:   press/press/doctype/usage_record/usage_record.json
	both modified:   press/press/doctype/user_2fa/user_2fa.json
	both modified:   press/press/doctype/user_ssh_certificate/user_ssh_certificate.json
	both modified:   press/press/doctype/user_ssh_key/user_ssh_key.json
	both modified:   press/press/doctype/version_upgrade/version_upgrade.json
	both modified:   press/press/doctype/virtual_disk_snapshot/virtual_disk_snapshot.json
	both modified:   press/press/doctype/virtual_machine/virtual_machine.json
	both modified:   press/press/doctype/virtual_machine_image/virtual_machine_image.json
	both modified:   press/press/doctype/virtual_machine_image_volume/virtual_machine_image_volume.json
	both modified:   press/press/doctype/virtual_machine_volume/virtual_machine_volume.json
	both modified:   press/press/doctype/wireguard_peer/wireguard_peer.json
	both modified:   press/press/doctype/yanked_app_release/yanked_app_release.json
	both modified:   press/workflow_engine/doctype/press_workflow/press_workflow.json
	both modified:   press/workflow_engine/doctype/press_workflow_task/press_workflow_task.json

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Base automatically changed from release/2026-W20 to master May 20, 2026 05:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant