From e7ad8fe59dd28a574695bcf929867ebb63767db4 Mon Sep 17 00:00:00 2001
From: Mael <96339570+ryzenixx@users.noreply.github.com>
Date: Tue, 18 Aug 2026 16:23:47 +0200
Subject: [PATCH 1/2] fix(oauth): prevent data loss during OAuth settings
 re-seed (#8210)

---
 database/seeders/OauthSettingSeeder.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/database/seeders/OauthSettingSeeder.php b/database/seeders/OauthSettingSeeder.php
index 2e5e6fcc4c..a3bc5ba4a7 100644
--- a/database/seeders/OauthSettingSeeder.php
+++ b/database/seeders/OauthSettingSeeder.php
@@ -50,10 +50,8 @@ class OauthSettingSeeder extends Seeder
                 $provider->delete();
             });
             $allProviders->each(function ($provider) {
-                $provider = new OauthSetting;
-                $provider->provider = $provider->provider;
-                unset($provider->id);
-                $provider->save();
+                $newProvider = $provider->replicate();
+                $newProvider->save();
             });
 
             foreach ($notFoundProviders as $provider) {

From 9281e8604cd0aa4df3c23b4a110458c4c2afbd2f Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Tue, 18 Aug 2026 16:24:11 +0200
Subject: [PATCH 2/2] ci: sync main changes to next

---
 .github/workflows/sync-main-to-next.yml | 60 +++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 .github/workflows/sync-main-to-next.yml

diff --git a/.github/workflows/sync-main-to-next.yml b/.github/workflows/sync-main-to-next.yml
new file mode 100644
index 0000000000..abbc9468c6
--- /dev/null
+++ b/.github/workflows/sync-main-to-next.yml
@@ -0,0 +1,60 @@
+name: Sync main to next
+
+on:
+  push:
+    branches: [main]
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+concurrency:
+  group: sync-main-to-next
+  cancel-in-progress: false
+
+jobs:
+  sync:
+    name: Merge main into next
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout next
+        uses: actions/checkout@v4
+        with:
+          ref: next
+          fetch-depth: 0
+
+      - name: Merge main into next
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          git config user.name 'github-actions[bot]'
+          git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
+          git fetch origin main next
+
+          if git merge --no-edit origin/main; then
+            git push origin HEAD:next
+            exit 0
+          fi
+
+          conflicts=$(git diff --name-only --diff-filter=U)
+          git merge --abort
+
+          if [ -z "$conflicts" ]; then
+            echo 'The merge failed without conflicts, so no pull request was created.'
+            exit 1
+          fi
+
+          existing_pr=$(gh pr list --base next --head main --state open --json url --jq '.[0].url')
+          if [ -n "$existing_pr" ]; then
+            echo "A main to next pull request already exists: $existing_pr"
+          else
+            gh pr create \
+              --base next \
+              --head main \
+              --title 'chore: merge main into next' \
+              --body 'This pull request was created automatically because main could not be merged into next without conflicts.'
+          fi
+
+          echo 'main could not be merged into next without conflicts.'
+          exit 1