fix(branding): preserve update artifacts after rebase

.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

config/constants.php

@@ -97,7 +97,7 @@
     ],
 
     // MapleDeploy branding: telemetry disabled
-    'sentry' => [
+    'sentry' => [ // disabled by MapleDeploy
         'sentry_dsn' => null,
     ],
 

config/sentry.php

@@ -2,8 +2,8 @@
 
 return [
 
-    // @see https://docs.sentry.io/product/sentry-basics/dsn-explainer/
+    // Sentry DSN disabled by MapleDeploy.
-    'dsn' => config('constants.sentry.sentry_dsn'),
+    '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
 
 ];

resources/views/emails/subscription-invoice-failed.blade.php

@@ -1,4 +1,4 @@
-{{-- MapleDeploy branding: Coolify Cloud references removed --}}
+{{-- MapleDeploy branding: upstream cloud references removed --}}
 <x-emails.layout>
 Your last invoice has failed to be paid for MapleDeploy.
 

resources/views/emails/trial-ended.blade.php

@@ -1,4 +1,4 @@
-{{-- MapleDeploy branding: Coolify Cloud references removed --}}
+{{-- MapleDeploy branding: upstream cloud references removed --}}
 <x-emails.layout>
 Your trial has ended. All automations and integrations are disabled for your servers.
 

resources/views/layouts/base.blade.php

@@ -57,7 +57,7 @@
             display: none !important;
         }
     </style>
-    {{-- MapleDeploy branding: Coolify Cloud analytics removed --}}
+    {{-- MapleDeploy branding: upstream cloud analytics removed --}}
     @auth
         <script type="text/javascript" src="{{ URL::asset('js/echo.js') }}"></script>
         <script type="text/javascript" src="{{ URL::asset('js/pusher.js') }}"></script>

resources/views/livewire/project/new/public-git-repository.blade.php

@@ -13,10 +13,8 @@
                 </x-forms.button>
             </div>
             <div>
-                {{-- MapleDeploy branding: link to upstream examples (still useful) --}}
+                For example application deployments, use any public repository that contains a Dockerfile,
-                For example application deployments, checkout <a class="underline dark:text-white"
+                build pack, or compose file.
-                    href="https://github.com/coollabsio/coolify-examples/" target="_blank">example
-                    repositories</a>.
             </div>
         </div>
     </form>

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</a> → choose
                     Project → Security → API Tokens.
-                    @if ($provider === 'hetzner')
-                        <br><br>
-                        Don't have a Hetzner account? <a href='https://coolify.io/hetzner' target='_blank'
-                            class='underline dark:text-white'>Sign up here</a>
-                        <br>
-                        <span class="text-xs">(Coolify's affiliate link, only new accounts - supports us (€10)
-                            and gives you €20)</span>
-                    @endif
                 </div>
             @endif
 
@@ -57,12 +49,6 @@ class='underline dark:text-white'>Sign up here</a>
                         Create an API token in the <a href='https://console.hetzner.com/projects' target='_blank'
                             class='underline dark:text-white'>Hetzner Console</a> → choose Project → Security → API
                         Tokens.
-                        <br><br>
-                        Don't have a Hetzner account? <a href='https://coolify.io/hetzner' target='_blank'
-                            class='underline dark:text-white'>Sign up here</a>
-                        <br>
-                        <span class="text-xs">(Coolify's affiliate link, only new accounts - supports us (€10)
-                            and gives you €20)</span>
                     </div>
                 @endif
             </div>

resources/views/livewire/subscription/pricing-plans.blade.php

@@ -116,8 +116,8 @@ class="font-bold dark:text-white">unlimited</span> applications per server</span
 
         {{-- BYOS Notice + Support --}}
         <div class="mt-6 pt-6 border-t dark:border-coolgray-400 border-neutral-200 text-sm dark:text-neutral-400">
-            <p>You need to bring your own servers from any cloud provider (<a class="underline" href="https://coolify.io/hetzner" target="_blank">Hetzner</a>, DigitalOcean, AWS, etc.) or connect any device running a <a class="underline" href="https://coolify.io/docs/installation#supported-operating-systems" target="_blank">supported OS</a>.</p>
+            <p>You need to bring your own servers from any cloud provider or connect any device running a supported operating system.</p>
-            <p class="mt-3">Need official support for your self-hosted instance? <a class="underline dark:text-white" href="https://coolify.io/docs/contact" target="_blank">Contact Us</a></p>
+            <p class="mt-3">Need support for your MapleDeploy instance? <a class="underline dark:text-white" href="https://mapledeploy.ca/contact" target="_blank">Contact us</a></p>
         </div>
     </div>
 </div>