Merge branch 'master' into unleash-next

# Conflicts: # .github/workflows/deploy-unleash-api-token-preprod.yaml # .github/workflows/deploy-unleash-api-token-prod.yaml
navikt · Sep 13, 2023 · f49f63e · f49f63e
1 parent 3ffa54c
commit f49f63e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/main/kotlin/no/nav/familie/ef/mottak/config/ApplicationConfig.kt b/src/main/kotlin/no/nav/familie/ef/mottak/config/ApplicationConfig.kt
@@ -31,6 +31,7 @@ import java.time.temporal.ChronoUnit
     "no.nav.familie.prosessering",
     "no.nav.familie.sikkerhet",
     "no.nav.familie.ef.mottak",
+    "no.nav.familie.unleash"
 )
 @ConfigurationPropertiesScan
 @EnableOAuth2Client(cacheEnabled = true)

diff --git a/src/test/kotlin/ApplicationLocal.kt b/src/test/kotlin/ApplicationLocal.kt
@@ -14,7 +14,6 @@ fun main(args: Array<String>) {
             "mock-dokument",
             "mock-ef-sak",
             "mock-pdf",
-            "no.nav.familie.unleash",
         )
         .run(*args)
 }