From 4257c83eb9753d9b7d264af5e186e12d55905f83 Mon Sep 17 00:00:00 2001
From: Conor Holden <conor@maykinmedia.nl>
Date: Tue, 1 Oct 2024 16:49:07 +0200
Subject: [PATCH 1/2] :bookmark:release 1.7.1

---
 .bumpversion.cfg                               |  2 +-
 CHANGELOG.rst                                  | 16 ++++++++++++++++
 README.rst                                     |  2 +-
 deployment/single-server/open-notificaties.yml |  2 +-
 package.json                                   |  2 +-
 src/nrc/__init__.py                            |  2 +-
 6 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index b1c44e6a..2028285e 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,7 +1,7 @@
 [bumpversion]
 commit = False
 tag = False
-current_version = 1.7.0
+current_version = 1.7.1
 
 [bumpversion:file:README.rst]
 
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 0d9ef691..11870338 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,22 @@
 Changes
 =======
 
+1.7.1 (2024-10-04)
+------------------
+
+**Bugfixes and QOL**
+
+* [#190] change SameSite session cookie to lax to fix OIDC login not working
+* [#190] fix API schema not showing caused by CSP errors
+* [#185] remove the need to manually configure Site.domain for the 2FA app title
+* [#188] change all setup configuration to disabled by default
+
+**Documentation**
+
+* [#188] update config env var descriptions
+* [#190, #191] remove broken links from documentation
+
+
 1.7.0 (2024-09-02)
 ------------------
 
diff --git a/README.rst b/README.rst
index cf16ca51..68a35552 100644
--- a/README.rst
+++ b/README.rst
@@ -2,7 +2,7 @@
 Open Notificaties
 =================
 
-:Version: 1.7.0
+:Version: 1.7.1
 :Source: https://github.com/open-zaak/open-notificaties
 :Keywords: zaken, zaakgericht werken, GEMMA, notificaties
 :PythonVersion: 3.11
diff --git a/deployment/single-server/open-notificaties.yml b/deployment/single-server/open-notificaties.yml
index a5ca53bb..53ac4413 100644
--- a/deployment/single-server/open-notificaties.yml
+++ b/deployment/single-server/open-notificaties.yml
@@ -60,7 +60,7 @@
 
     - role: open_notificaties_docker
       vars:
-        opennotificaties_version: '1.7.0'  # see https://hub.docker.com/r/openzaak/open-notificaties/tags
+        opennotificaties_version: '1.7.1'  # see https://hub.docker.com/r/openzaak/open-notificaties/tags
         opennotificaties_cache_db: 1
       tags:
         - replicas
diff --git a/package.json b/package.json
index 75ac2068..c315bebc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nrc",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "Open Notificaties",
   "main": "src/index.js",
   "directories": {
diff --git a/src/nrc/__init__.py b/src/nrc/__init__.py
index f356b93f..c11e01be 100644
--- a/src/nrc/__init__.py
+++ b/src/nrc/__init__.py
@@ -2,6 +2,6 @@
 
 __all__ = ("celery_app",)
 
-__version__ = "1.7.0"
+__version__ = "1.7.1"
 __author__ = "Maykin Media"
 __homepage__ = "https://github.com/open-zaak/open-notificaties"

From f7be44ee85a0312e80b8843be36a297c86eb00c5 Mon Sep 17 00:00:00 2001
From: Conor Holden <conor@maykinmedia.nl>
Date: Fri, 4 Oct 2024 10:06:27 +0200
Subject: [PATCH 2/2] :green_heart:[maykinmedia/objects-api#463] Temporarily
 disable Trivy in CI

---
 .github/workflows/ci.yml | 44 ++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dcf1ee86..be8aa3b6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -124,28 +124,28 @@ jobs:
           path: image.tar
           retention-days: 1
 
-  image_scan:
-    runs-on: ubuntu-latest
-    name: Scan docker image
-    needs:
-      - docker
-
-    steps:
-      - name: Download built image
-        uses: actions/download-artifact@v4
-        with:
-          name: docker-image
-      - name: Scan image with Trivy
-        uses: aquasecurity/trivy-action@master
-        with:
-          input: /github/workspace/image.tar  # from download-artifact
-          format: 'sarif'
-          output: 'trivy-results-docker.sarif'
-          ignore-unfixed: true
-      - name: Upload results to GH Security tab
-        uses: github/codeql-action/upload-sarif@v2
-        with:
-          sarif_file: 'trivy-results-docker.sarif'
+#  image_scan:
+#    runs-on: ubuntu-latest
+#    name: Scan docker image
+#    needs:
+#      - docker
+#
+#    steps:
+#      - name: Download built image
+#        uses: actions/download-artifact@v4
+#        with:
+#          name: docker-image
+#      - name: Scan image with Trivy
+#        uses: aquasecurity/trivy-action@master
+#        with:
+#          input: /github/workspace/image.tar  # from download-artifact
+#          format: 'sarif'
+#          output: 'trivy-results-docker.sarif'
+#          ignore-unfixed: true
+#      - name: Upload results to GH Security tab
+#        uses: github/codeql-action/upload-sarif@v2
+#        with:
+#          sarif_file: 'trivy-results-docker.sarif'
 
   publish:
     needs: