Resolve merge conflicts from upstream v0.62.1 sync

* Keep teal brand and warning colours in light.ts and dark.ts
* Take v0.62.1 version for all other values

Author: trevorgowing

.clj-kondo/config/modules/config.edn

@@ -160,13 +160,8 @@
               metabase.agent-api.init}
    :uses    #{api
               auth-identity
-<<<<<<< HEAD
-              collections
-||||||| 0a60f2436f
-=======
               channel
               collections
->>>>>>> v0.62.1
               dashboards
               events
               lib

.github/workflows/backend.yml

@@ -49,67 +49,6 @@ jobs:
       - run: clojure -X:dev:ee:ee-dev:drivers:drivers-dev:test:eastwood/test
         name: Run Eastwood linter on our backend tests
 
-<<<<<<< HEAD
-  be-linter-eastwood-test-changed:
-    # PR / merge queue: lint only the test namespaces touched by the diff.
-    if: ${{ !inputs.skip && (github.event_name == 'pull_request' || github.event_name == 'merge_group') }}
-    runs-on: ${{ vars.DEFAULT_RUNNER_KEY }}
-    timeout-minutes: 15
-    name: Eastwood (changed tests only)
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          # Enough history for `git merge-base` on a typical PR.
-          fetch-depth: 200
-      - name: Prepare back-end environment
-        uses: ./.github/actions/prepare-backend
-      - name: Compute changed test namespaces
-        id: changed
-        env:
-          BASE_SHA: ${{ github.event.pull_request.base.sha || github.event.merge_group.base_sha }}
-          HEAD_SHA: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha || github.sha }}
-        run: |
-          set -euo pipefail
-
-          # Diff from the merge-base so changes that landed on the base branch after the PR was
-          # last synced don't widen our scope. Falls back to BASE_SHA if older than fetched depth.
-          git fetch --no-tags --depth=200 origin "$BASE_SHA"
-          DIFF_BASE=$(git merge-base "$BASE_SHA" "$HEAD_SHA" 2>/dev/null || echo "$BASE_SHA")
-          # Test roots we lint: core, EE, and each driver module's test tree.
-          # :eastwood/test derives matching :source-paths from the classpath, so any
-          # namespace we name here is reachable. Include renames (R) so a test that
-          # was just renamed still gets linted under its new name.
-          FILES=$(git diff --name-only --diff-filter=AMR "$DIFF_BASE" "$HEAD_SHA" \
-                    -- 'test/**/*.clj' 'test/**/*.cljc' \
-                       'enterprise/backend/test/**/*.clj' 'enterprise/backend/test/**/*.cljc' \
-                       'modules/drivers/**/test/**/*.clj' 'modules/drivers/**/test/**/*.cljc')
-
-          if [ -z "$FILES" ]; then
-            echo "No backend test files changed; skipping lint."
-            echo "namespaces=" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-
-          # Defence-in-depth: paths flow into a subsequent shell command via $GITHUB_OUTPUT.
-          if grep -Eqv '^[A-Za-z0-9_./-]+$' <<<"$FILES"; then
-            echo "Refusing to lint: unexpected characters in changed file paths:" >&2
-            echo "$FILES" >&2
-            exit 1
-          fi
-
-          NS=$(sed -E 's#^(test/|enterprise/backend/test/|modules/drivers/[^/]+/test/)##; s#\.cljc?$##; s#/#.#g; s#_#-#g' <<<"$FILES" \
-                 | sort -u \
-                 | paste -sd' ' -)
-          echo "Changed test namespaces: $NS"
-          echo "namespaces=$NS" >> "$GITHUB_OUTPUT"
-      - name: Run Eastwood on changed test namespaces
-        if: steps.changed.outputs.namespaces != ''
-        env:
-          NAMESPACES: ${{ steps.changed.outputs.namespaces }}
-        run: clojure -X:dev:ee:ee-dev:drivers:drivers-dev:test:eastwood/test :namespaces "[$NAMESPACES]"
-
-||||||| 0a60f2436f
-=======
   be-linter-eastwood-test-changed:
     # PR / merge queue: lint only the test namespaces touched by the diff.
     if: ${{ !inputs.skip && (github.event_name == 'pull_request' || github.event_name == 'merge_group') }}
@@ -168,7 +107,6 @@ jobs:
           NAMESPACES: ${{ steps.changed.outputs.namespaces }}
         run: clojure -X:dev:ee:ee-dev:drivers:drivers-dev:test:eastwood/test :namespaces "[$NAMESPACES]"
 
->>>>>>> v0.62.1
   be-tests:
     if: ${{ !inputs.skip }}
     runs-on: ${{ vars.DEFAULT_RUNNER_KEY }}

.github/workflows/docs-generate-base.yml

@@ -33,20 +33,11 @@ jobs:
       - name: Prepare backend environment
         uses: ./.github/actions/prepare-backend
 
-<<<<<<< HEAD
-      - name: Set up Babashka
-        uses: turtlequeue/setup-babashka@2d4df498c7a578b4f3e906283f9af913590bdec7 # v1.7.0
-        with:
-          babashka-version: 1.12.197
-
-||||||| 0a60f2436f
-=======
       - name: Set up Babashka
         uses: turtlequeue/setup-babashka@d78ec6570aea3b614bc695cafcceb82eb45c2af9 # v1.8.0
         with:
           babashka-version: 1.12.197
 
->>>>>>> v0.62.1
       - name: Generate environment variables documentation
         id: generate_env_docs
         run: |

frontend/src/metabase/ui/colors/constants/themes/dark.ts

@@ -35,17 +35,8 @@ export const METABASE_DARK_THEME: MetabaseThemeV2 = {
     overlay: baseColors.orionAlpha[70],
     "background-error": baseColors.lobster[90],
     "background-success": baseColors.palm[90],
-<<<<<<< HEAD
-<<<<<<< HEAD
-    brand: "#135756",
-=======
-    "background-success-secondary": baseColors.palm[70],
-||||||| 0a60f2436f
-=======
     "background-success-secondary": baseColors.palm[70],
->>>>>>> v0.62.1
-    brand: baseColors.blue[40],
->>>>>>> v0.61.3
+    brand: "#135756",
     "brand-hover": baseColors.brand[30],
     danger: baseColors.lobster[50],
     error: baseColors.lobster[50],
@@ -86,18 +77,9 @@ export const METABASE_DARK_THEME: MetabaseThemeV2 = {
     "tooltip-background": baseColors.orion[70],
     "tooltip-text-secondary": baseColors.orionAlphaInverse[60],
     "tooltip-text": baseColors.orionAlphaInverse[80],
-<<<<<<< HEAD
     warning: "#E2B018",
     "background-warning": "color-mix(in srgb, #E2B018, black 70%)",
     "background-warning-secondary": "color-mix(in srgb, #E2B018, black 50%)",
-||||||| 0a60f2436f
-    warning: baseColors.dubloon[30],
-    "background-warning": baseColors.dubloon[90],
-=======
-    warning: baseColors.dubloon[30],
-    "background-warning": baseColors.dubloon[90],
-    "background-warning-secondary": baseColors.dubloon[70],
->>>>>>> v0.62.1
     info: baseColors.orion[50],
     "background-info": baseColors.orion[90],
     white: baseColors.orion[110],

frontend/src/metabase/ui/colors/constants/themes/light.ts

@@ -35,17 +35,8 @@ export const METABASE_LIGHT_THEME: MetabaseThemeV2 = {
     overlay: baseColors.orionAlpha[60],
     "background-error": baseColors.lobster[10],
     "background-success": baseColors.palm[5],
-<<<<<<< HEAD
-<<<<<<< HEAD
-    brand: "#135756",
-=======
-    "background-success-secondary": baseColors.palm[20],
-||||||| 0a60f2436f
-=======
     "background-success-secondary": baseColors.palm[20],
->>>>>>> v0.62.1
-    brand: baseColors.blue[40],
->>>>>>> v0.61.3
+    brand: "#135756",
     "brand-hover": baseColors.brand[50],
     danger: baseColors.lobster[50],
     error: baseColors.lobster[50],
@@ -86,18 +77,9 @@ export const METABASE_LIGHT_THEME: MetabaseThemeV2 = {
     "tooltip-background": baseColors.orion[80],
     "tooltip-text-secondary": baseColors.orionAlphaInverse[60],
     "tooltip-text": baseColors.white,
-<<<<<<< HEAD
     warning: "#E2B018",
     "background-warning": "#FDF0C8",
     "background-warning-secondary": "color-mix(in srgb, #E2B018, white 70%)",
-||||||| 0a60f2436f
-    warning: baseColors.dubloon[30],
-    "background-warning": baseColors.dubloon[5],
-=======
-    warning: baseColors.dubloon[30],
-    "background-warning": baseColors.dubloon[5],
-    "background-warning-secondary": baseColors.dubloon[20],
->>>>>>> v0.62.1
     info: baseColors.orion[40],
     "background-info": baseColors.orion[10],
     white: baseColors.white,