From 90e50cc35e8eb628ae5eb51741a8a4e5677d7bdf Mon Sep 17 00:00:00 2001
From: George <me@georgemac.com>
Date: Tue, 21 Nov 2023 13:22:56 +0000
Subject: [PATCH 1/2] Merge pull request #2422 from flipt-io/gm/attach-array

test(cue): add failing case for attachment array support
---
 internal/cue/flipt.cue           | 2 +-
 internal/cue/testdata/valid.yaml | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/internal/cue/flipt.cue b/internal/cue/flipt.cue
index b9a475314e..636f590dbc 100644
--- a/internal/cue/flipt.cue
+++ b/internal/cue/flipt.cue
@@ -31,7 +31,7 @@ close({
 	key:          string & =~"^.+$"
 	name?:        string & =~"^.+$"
 	description?: string
-	attachment:   {...} | *null
+	attachment:   {...} | [...] | *null
 }
 
 #RuleSegment: {
diff --git a/internal/cue/testdata/valid.yaml b/internal/cue/testdata/valid.yaml
index f4e11d4697..e05848f80c 100644
--- a/internal/cue/testdata/valid.yaml
+++ b/internal/cue/testdata/valid.yaml
@@ -10,6 +10,15 @@ flags:
   - key: flipt
     name: flipt
     description: I'm a description.
+  - key: withAttachmentObject
+    name: With Attachment Object
+    attachment:
+      an: Object
+  - key: withAttachmentArray
+    name: With Attachment Array
+    attachment:
+      - an
+      - array
   rules:
   - segment: internal-users
     distributions:

From 43fa21208f6e070c60c3f9dc63528d7d650b0d7f Mon Sep 17 00:00:00 2001
From: Mark Phelps <209477+markphelps@users.noreply.github.com>
Date: Tue, 21 Nov 2023 14:06:27 -0500
Subject: [PATCH 2/2] chore: prep for 1.31.2 (#2425)

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be3fdbf351..009fe2ffe7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,18 @@
 This format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v1.31.2](https://github.com/flipt-io/flipt/releases/tag/v1.31.2) - 2023-11-21
+
+### Fixed
+
+- Make CUE schema more permissive and accepts arrays, as well as objects under variant attachments (#2422)
+
+## [v1.31.1](https://github.com/flipt-io/flipt/releases/tag/v1.31.1) - 2023-11-16
+
+### Fixed
+
+- Support Flipt running over Git repositories with submodules (#2405)
+
 ## [v1.31.0](https://github.com/flipt-io/flipt/releases/tag/v1.31.0) - 2023-11-15
 
 ### Added