Merge pull request #6819 from metabase/update_master

Update master with RC commits.

bin/version

 #!/usr/bin/env bash
 
-VERSION="v0.28.0-snapshot"
+VERSION="v0.28.0.RC1"
 
 # dynamically pull more interesting stuff from latest git commit
 HASH=$(git show-ref --head --hash=7 head)            # first 7 letters of hash should be enough; that's what GitHub uses

src/metabase/query_processor/middleware/expand_macros.clj

@@ -76,7 +76,7 @@
   [[_ id]]
   (boolean
    (when ((some-fn string? keyword?) id)
-     (re-find #"^ga:" (name id)))))
+     (re-find #"^ga(id)?:" (name id)))))
 
 (defn- metric? [aggregation]
   (and (is-clause? #{:metric} aggregation)

test/metabase/query_processor/middleware/expand_macros_test.clj

@@ -184,3 +184,7 @@
 (expect
   {:query {:aggregation [[:metric :ga:users]]}}
   (#'expand-macros/expand-metrics-and-segments {:query {:aggregation [[:metric :ga:users]]}}))
+
+(expect
+  {:query {:aggregation [[:metric :gaid:users]]}}
+  (#'expand-macros/expand-metrics-and-segments {:query {:aggregation [[:metric :gaid:users]]}}))