Merge remote-tracking branch 'upstream/dev-2.x' into upstream-merge-2…

…024-09-20
ibi-group · Sep 20, 2024 · 682c5da · 682c5da
2 parents 33c8481 + 12273e7
commit 682c5da
Show file tree

Hide file tree

Showing 131 changed files with 26,491 additions and 1,147 deletions.
diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml
@@ -132,7 +132,7 @@ jobs:
       LOCAL_BRANCH: local-pages
       REMOTE_BRANCH: main
       TOKEN: ${{ secrets.CHANGELOG_TOKEN }}
-      MASTER_BRANCH_VERSION: 2.5.0
+      MASTER_BRANCH_VERSION: 2.6.0
 
     steps:
 

diff --git a/client/.env b/client/.env
@@ -1,3 +1,3 @@
 VITE_API_URL=/otp/transmodel/v3
 VITE_DEBUG_STYLE_URL=/otp/routers/default/inspector/vectortile/style.json
-
+VITE_GRAPHIQL_URL=/graphiql?flavor=transmodel
diff --git a/client/.env.development b/client/.env.development
@@ -1,2 +1,3 @@
 VITE_API_URL=http://localhost:8080/otp/transmodel/v3
-VITE_DEBUG_STYLE_URL=http://localhost:8080/otp/routers/default/inspector/vectortile/style.json
+VITE_DEBUG_STYLE_URL=http://localhost:8080/otp/routers/default/inspector/vectortile/style.json
+VITE_GRAPHIQL_URL=http://localhost:8080/graphiql?flavor=transmodel