Merge branch 'main' into dev/jwt

community-boating · Feb 11, 2024 · b1c3490 · b1c3490
2 parents e15404e + 4d46b61
commit b1c3490
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
@@ -3,7 +3,7 @@ name: Scala CI
 on:
   push:
     branches:
-      - master
+      - main
       - release/*
       - dev/*
       - cluster/*

diff --git a/.gitignore b/.gitignore
@@ -14,4 +14,4 @@ npm-debug.log
 
 start.sh
 
-.bsp/sbt.json
+.bsp/
diff --git a/conf/routes-build/src/10_boathouse b/conf/routes-build/src/10_boathouse
@@ -74,9 +74,9 @@ POST    /auth/set-staff-pw              org.sailcbi.APIServer.Api.Endpoints.Secu
 
 ### DOCKHOUSE
 
-GET    /staff/dockhouse/scan-card      org.sailcbi.APIServer.Api.Endpoints.Staff.Dockhouse.ScanCard.ScanCard.get(cardNumber: String)
-POST    /staff/dockhouse/create-signout     org.sailcbi.APIServer.Api.Endpoints.Staff.Dockhouse.CreateSignout.CreateSignout.post()
-POST    /staff/dockhouse/create-signout-multiple     org.sailcbi.APIServer.Api.Endpoints.Staff.Dockhouse.CreateSignout.CreateSignout.postMany()
-GET     /staff/dockhouse/dh-globals     org.sailcbi.APIServer.Api.Endpoints.Staff.Dockhouse.GetDhGlobals.get()
-POST    /staff/dockhouse/grant-ratings     org.sailcbi.APIServer.Api.Endpoints.Staff.Dockhouse.GrantRatings.post()
-POST    /staff/dockhouse/put-flag-change     org.sailcbi.APIServer.Api.Endpoints.Staff.Dockhouse.PutFlagChange.post()
+#GET    /staff/dockhouse/scan-card      org.sailcbi.APIServer.Api.Endpoints.Staff.Dockhouse.ScanCard.ScanCard.get(cardNumber: String)
+#POST    /staff/dockhouse/create-signout     org.sailcbi.APIServer.Api.Endpoints.Staff.Dockhouse.CreateSignout.CreateSignout.post()
+#POST    /staff/dockhouse/create-signout-multiple     org.sailcbi.APIServer.Api.Endpoints.Staff.Dockhouse.CreateSignout.CreateSignout.postMany()
+#GET     /staff/dockhouse/dh-globals     org.sailcbi.APIServer.Api.Endpoints.Staff.Dockhouse.GetDhGlobals.get()
+#POST    /staff/dockhouse/grant-ratings     org.sailcbi.APIServer.Api.Endpoints.Staff.Dockhouse.GrantRatings.post()
+#POST    /staff/dockhouse/put-flag-change     org.sailcbi.APIServer.Api.Endpoints.Staff.Dockhouse.PutFlagChange.post()
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,5 +1,5 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0") // rel 25 oct 2023
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.1") // rel 19 dec 2023
 
 // web plugins
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Scala CI @@
     on:
       push:
         branches:
-          - master
+          - main
           - release/*
           - dev/*
           - cluster/*
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,4 +14,4 @@ npm-debug.log

		start.sh

		.bsp/sbt.json
		.bsp/