From 59fe174633d9c7cb201f9321403328352a317b0e Mon Sep 17 00:00:00 2001 From: rosslh Date: Fri, 19 Jun 2026 19:53:39 -0400 Subject: [PATCH] fix(branding): preserve update artifacts after rebase --- .forgejo/workflows/build.yml | 1 + config/constants.php | 2 +- config/sentry.php | 16 ++++++++-------- .../emails/subscription-invoice-failed.blade.php | 2 +- resources/views/emails/trial-ended.blade.php | 2 +- resources/views/layouts/base.blade.php | 2 +- .../project/new/public-git-repository.blade.php | 6 ++---- .../security/cloud-provider-token-form.blade.php | 14 -------------- .../subscription/pricing-plans.blade.php | 4 ++-- 9 files changed, 17 insertions(+), 32 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 594980f5d..686123d4f 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -89,6 +89,7 @@ jobs: upload versions.json versions.json upload scripts/upgrade.sh upgrade.sh + upload scripts/upgrade-postgres.sh upgrade-postgres.sh upload docker-compose.yml docker-compose.yml upload docker-compose.prod.yml docker-compose.prod.yml upload .env.production .env.production diff --git a/config/constants.php b/config/constants.php index 23754211a..71d29776d 100644 --- a/config/constants.php +++ b/config/constants.php @@ -97,7 +97,7 @@ ], // MapleDeploy branding: telemetry disabled - 'sentry' => [ + 'sentry' => [ // disabled by MapleDeploy 'sentry_dsn' => null, ], diff --git a/config/sentry.php b/config/sentry.php index 0efb4a0e2..83f00730c 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -2,8 +2,8 @@ return [ - // @see https://docs.sentry.io/product/sentry-basics/dsn-explainer/ - 'dsn' => config('constants.sentry.sentry_dsn'), + // Sentry DSN disabled by MapleDeploy. + 'dsn' => config('constants.sentry.sentry_dsn'), // disabled by MapleDeploy // The release version of your application // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) @@ -40,7 +40,7 @@ 'tracing' => [ // Trace queue jobs as their own transactions - 'queue_job_transactions' => env('SENTRY_TRACE_QUEUE_ENABLED', false), + 'queue_job_transactions' => env('SENTRY_TRACE_QUEUE_ENABLED', false), // disabled by MapleDeploy // Capture queue jobs as spans when executed on the sync driver 'queue_jobs' => true, @@ -61,12 +61,12 @@ 'http_client_requests' => true, // Capture Redis operations as spans (this enables Redis events in Laravel) - 'redis_commands' => env('SENTRY_TRACE_REDIS_COMMANDS', false), + 'redis_commands' => env('SENTRY_TRACE_REDIS_COMMANDS', false), // disabled by MapleDeploy // Try to find out where the Redis command originated from and add it to the command spans 'redis_origin' => true, - // Indicates if the tracing integrations supplied by Sentry should be loaded + // Indicates if the tracing integrations supplied by Sentry should be loaded; disabled by MapleDeploy. 'default_integrations' => true, // Indicates that requests without a matching route should be traced @@ -74,12 +74,12 @@ ], // @see: https://docs.sentry.io/platforms/php/guides/laravel/configuration/options/#send-default-pii - 'send_default_pii' => env('SENTRY_SEND_DEFAULT_PII', false), + 'send_default_pii' => env('SENTRY_SEND_DEFAULT_PII', false), // disabled by MapleDeploy // @see: https://docs.sentry.io/platforms/php/guides/laravel/configuration/options/#traces-sample-rate - 'enable_tracing' => env('SENTRY_ENABLE_TRACING', false), + 'enable_tracing' => env('SENTRY_ENABLE_TRACING', false), // disabled by MapleDeploy 'traces_sample_rate' => 0.2, - 'profiles_sample_rate' => env('SENTRY_PROFILES_SAMPLE_RATE') === null ? null : (float) env('SENTRY_PROFILES_SAMPLE_RATE'), + 'profiles_sample_rate' => env('SENTRY_PROFILES_SAMPLE_RATE') === null ? null : (float) env('SENTRY_PROFILES_SAMPLE_RATE'), // disabled by MapleDeploy ]; diff --git a/resources/views/emails/subscription-invoice-failed.blade.php b/resources/views/emails/subscription-invoice-failed.blade.php index 7b1a95497..b2010f327 100644 --- a/resources/views/emails/subscription-invoice-failed.blade.php +++ b/resources/views/emails/subscription-invoice-failed.blade.php @@ -1,4 +1,4 @@ -{{-- MapleDeploy branding: Coolify Cloud references removed --}} +{{-- MapleDeploy branding: upstream cloud references removed --}} Your last invoice has failed to be paid for MapleDeploy. diff --git a/resources/views/emails/trial-ended.blade.php b/resources/views/emails/trial-ended.blade.php index 5dd2fb2f1..765a6d6cd 100644 --- a/resources/views/emails/trial-ended.blade.php +++ b/resources/views/emails/trial-ended.blade.php @@ -1,4 +1,4 @@ -{{-- MapleDeploy branding: Coolify Cloud references removed --}} +{{-- MapleDeploy branding: upstream cloud references removed --}} Your trial has ended. All automations and integrations are disabled for your servers. diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index d0ef06eac..963d05040 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -57,7 +57,7 @@ display: none !important; } - {{-- MapleDeploy branding: Coolify Cloud analytics removed --}} + {{-- MapleDeploy branding: upstream cloud analytics removed --}} @auth diff --git a/resources/views/livewire/project/new/public-git-repository.blade.php b/resources/views/livewire/project/new/public-git-repository.blade.php index f7eef30b7..403e37ee4 100644 --- a/resources/views/livewire/project/new/public-git-repository.blade.php +++ b/resources/views/livewire/project/new/public-git-repository.blade.php @@ -13,10 +13,8 @@
- {{-- MapleDeploy branding: link to upstream examples (still useful) --}} - For example application deployments, checkout example - repositories. + For example application deployments, use any public repository that contains a Dockerfile, + build pack, or compose file.
diff --git a/resources/views/livewire/security/cloud-provider-token-form.blade.php b/resources/views/livewire/security/cloud-provider-token-form.blade.php index e803aa00c..ae25ba995 100644 --- a/resources/views/livewire/security/cloud-provider-token-form.blade.php +++ b/resources/views/livewire/security/cloud-provider-token-form.blade.php @@ -23,14 +23,6 @@ href='{{ $provider === 'hetzner' ? 'https://console.hetzner.com/projects' : '#' }}' target='_blank' class='underline dark:text-white'>{{ ucfirst($provider) }} Console → choose Project → Security → API Tokens. - @if ($provider === 'hetzner') -

- Don't have a Hetzner account? Sign up here -
- (Coolify's affiliate link, only new accounts - supports us (€10) - and gives you €20) - @endif @endif @@ -57,12 +49,6 @@ class='underline dark:text-white'>Sign up here Create an API token in the Hetzner Console → choose Project → Security → API Tokens. -

- Don't have a Hetzner account? Sign up here -
- (Coolify's affiliate link, only new accounts - supports us (€10) - and gives you €20) @endif diff --git a/resources/views/livewire/subscription/pricing-plans.blade.php b/resources/views/livewire/subscription/pricing-plans.blade.php index 45edc39ad..70a3c246f 100644 --- a/resources/views/livewire/subscription/pricing-plans.blade.php +++ b/resources/views/livewire/subscription/pricing-plans.blade.php @@ -116,8 +116,8 @@ class="font-bold dark:text-white">unlimited applications per server -

You need to bring your own servers from any cloud provider (Hetzner, DigitalOcean, AWS, etc.) or connect any device running a supported OS.

-

Need official support for your self-hosted instance? Contact Us

+

You need to bring your own servers from any cloud provider or connect any device running a supported operating system.

+

Need support for your MapleDeploy instance? Contact us