Merge branch 'master' into feature/dolly-frontend-react-hook-form-mig…

…ration # Conflicts: # apps/dolly-frontend/src/main/js/package-lock.json # apps/dolly-frontend/src/main/js/package.json # apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlEksisterendePerson.tsx # apps/dolly-frontend/src/main/js/src/pages/dollySoek/SoekForm.tsx
navikt · Dec 15, 2023 · ee261d9 · ee261d9
2 parents b4a7c06 + e4c2056
commit ee261d9
Show file tree

Hide file tree

Showing 317 changed files with 5,027 additions and 15,575 deletions.
diff --git a/.github/workflows/app.arbeidsforhold-export-api.yml b/.github/workflows/app.arbeidsforhold-export-api.yml
diff --git a/.github/workflows/app.testnorge-tp.yml b/.github/workflows/app.testnorge-tp.yml
diff --git a/.github/workflows/proxy.arbeidsplassencv-proxy.yml b/.github/workflows/proxy.arbeidsplassencv-proxy.yml
@@ -14,9 +14,8 @@ jobs:
   workflow:
     uses: ./.github/workflows/common.workflow.backend.yml
     with:
-      cluster: "dev-fss"
       working-directory: "proxies/arbeidsplassencv-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-arbeidsplassencv-proxy"
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/proxy.statisk-data-forvalter-proxy.yml b/.github/workflows/proxy.statisk-data-forvalter-proxy.yml
diff --git a/...nav/testnav/apps/apptilganganalyseservice/AppTilgangAnalyseServiceApplicationStarter.java b/...nav/testnav/apps/apptilganganalyseservice/AppTilgangAnalyseServiceApplicationStarter.java
@@ -18,4 +18,4 @@ public class AppTilgangAnalyseServiceApplicationStarter {
     public static void main(String[] args) {
         SpringApplication.run(AppTilgangAnalyseServiceApplicationStarter.class, args);
     }
-}
+}
diff --git a/apps/arbeidsforhold-export-api/Dockerfile b/apps/arbeidsforhold-export-api/Dockerfile
diff --git a/apps/arbeidsforhold-export-api/README.md b/apps/arbeidsforhold-export-api/README.md
diff --git a/apps/arbeidsforhold-export-api/build.gradle b/apps/arbeidsforhold-export-api/build.gradle
diff --git a/apps/arbeidsforhold-export-api/config.yml b/apps/arbeidsforhold-export-api/config.yml
diff --git a/apps/arbeidsforhold-export-api/gradle/wrapper/gradle-wrapper.jar b/apps/arbeidsforhold-export-api/gradle/wrapper/gradle-wrapper.jar
diff --git a/apps/arbeidsforhold-export-api/gradle/wrapper/gradle-wrapper.properties b/apps/arbeidsforhold-export-api/gradle/wrapper/gradle-wrapper.properties
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,4 +18,4 @@ public class AppTilgangAnalyseServiceApplicationStarter { @@
         public static void main(String[] args) {
             SpringApplication.run(AppTilgangAnalyseServiceApplicationStarter.class, args);
         }
-    }
+    }