Merge branch 'SLB-497-centralised-seo-settings' into dev

AmazeeLabs · Dec 4, 2024 · 89f0d62 · 89f0d62
2 parents 9808a0b + f74f454
commit 89f0d62
Show file tree

Hide file tree

Showing 124 changed files with 18,806 additions and 17,058 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -14,7 +14,7 @@ runs:
     - name: Check xdebug config
       shell: bash
       run: |
-        if ! php --info | grep 'xdebug.mode => develop => develop'; then
+        if ! php --info | grep 'xdebug.mode => no value => no value'; then
           echo 'Error: xdebug.mode should not be set in CI. Have you committed xdebug config by accident? Check devbox.d/php/php.ini'
           exit 1
         fi

diff --git a/.github/workflows/merge_dev_to_stage.yml b/.github/workflows/merge_dev_to_stage.yml
@@ -17,5 +17,6 @@ jobs:
         uses: devmasx/[email protected]
         with:
           type: now
+          from_branch: dev
           target_branch: stage
           github_token: ${{ github.token }}
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,4 @@ dts
 apps/website/.env
 .DS_Store
 .turbo
-_local
+/_local
diff --git a/.prettierignore → .prettierignore-root b/.prettierignore → .prettierignore-root
diff --git a/apps/cms/composer.json b/apps/cms/composer.json
@@ -173,6 +173,7 @@
   },
   "require-dev": {
     "drupal/core-dev": "^10",
+    "drupal/devel": "^5.3",
     "phpspec/prophecy-phpunit": "^2.0.2"
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,4 +10,4 @@ dts @@
     apps/website/.env
     .DS_Store
     .turbo
-    _local
+    /_local