Merge branch 'hotfix-1.2.x' into main

COmanage · Dec 7, 2023 · 044dcc6 · 044dcc6
2 parents 5b67cca + 9c47ccb
commit 044dcc6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/app/config/VERSION b/app/config/VERSION
@@ -1 +1 @@
-1.2.0
+1.2.1
diff --git a/app/src/Lib/Match/MatchService.php b/app/src/Lib/Match/MatchService.php
@@ -1012,7 +1012,10 @@ public function setConfig(int $matchgridId) {
                                             ],
                                             'MatchgridSettings',
                                             'PotentialRules' => [
-                                              'RuleAttributes' => ['Attributes' => 'AttributeGroups'],
+                                              'RuleAttributes' => [
+                                                'Attributes' => 'AttributeGroups',
+                                                'CrosscheckAttributes' => 'AttributeGroups'
+                                              ],
                                               'sort' => ['PotentialRules.ordr' => 'ASC']
                                             ]])
                                  ->firstOrFail();

diff --git a/container/aws_buildspec.yml b/container/aws_buildspec.yml
@@ -3,7 +3,7 @@ version: 0.2
 env:
   shell: bash
   variables:
-    LABEL: "1.2.0"
+    LABEL: "1.2.1"
   exported-variables:
     - LABEL