Merge branch 'main' into add-user

Author: cunla

terraform/production/repositories.tfvars

@@ -19,7 +19,6 @@ repositories = {
     allow_squash_merge = true
     topics = []
     push_allowances = []
-    visibility         = "public"
     skip_team_creation = true
   }
 

terraform/resources-repos.tf

@@ -10,8 +10,12 @@ resource "github_repository" "this" {
 
   allow_auto_merge       = each.value.allow_auto_merge
   allow_merge_commit     = each.value.allow_merge_commit
+  merge_commit_title = "MERGE_MESSAGE"
+  merge_commit_message = "PR_BODY"
   allow_rebase_merge     = each.value.allow_rebase_merge
   allow_squash_merge     = each.value.allow_squash_merge
+  squash_merge_commit_title = "COMMIT_OR_PR_TITLE"
+  squash_merge_commit_message = "COMMIT_MESSAGES"
   allow_update_branch    = each.value.allow_update_branch
   archive_on_destroy     = true
   delete_branch_on_merge = each.value.delete_branch_on_merge

terraform/tfstate.json

@@ -1,7 +1,7 @@
 {
   "version": 4,
   "terraform_version": "1.9.3",
-  "serial": 101,
+  "serial": 106,
   "lineage": "425397de-8394-a003-8a6c-bce854d9cc53",
   "outputs": {},
   "resources": [
@@ -265,7 +265,7 @@
             "ignore_vulnerability_alerts_during_read": null,
             "is_template": false,
             "license_template": null,
-            "merge_commit_message": "PR_TITLE",
+            "merge_commit_message": "PR_BODY",
             "merge_commit_title": "MERGE_MESSAGE",
             "name": ".github",
             "node_id": "R_kgDOLkyRSQ",
@@ -316,7 +316,7 @@
             "default_branch": "main",
             "delete_branch_on_merge": true,
             "description": "The controls for managing Django Commons projects",
-            "etag": "W/\"35dfa2e1e4b4863722d8d5c4264b6c909161422017a07748e6a1c886325e84a5\"",
+            "etag": "W/\"f21535f354352d4b0866f09e46da800223b87f556d5273c34d4313beb23f79f8\"",
             "full_name": "django-commons/controls",
             "git_clone_url": "git://github.com/django-commons/controls.git",
             "gitignore_template": null,
@@ -332,7 +332,7 @@
             "ignore_vulnerability_alerts_during_read": null,
             "is_template": false,
             "license_template": null,
-            "merge_commit_message": "PR_TITLE",
+            "merge_commit_message": "PR_BODY",
             "merge_commit_title": "MERGE_MESSAGE",
             "name": "controls",
             "node_id": "R_kgDOLkDK8g",
@@ -399,7 +399,7 @@
             "ignore_vulnerability_alerts_during_read": null,
             "is_template": false,
             "license_template": null,
-            "merge_commit_message": "PR_TITLE",
+            "merge_commit_message": "PR_BODY",
             "merge_commit_title": "MERGE_MESSAGE",
             "name": "django-commons-playground",
             "node_id": "R_kgDOLkANrg",
@@ -466,7 +466,7 @@
             "ignore_vulnerability_alerts_during_read": null,
             "is_template": false,
             "license_template": null,
-            "merge_commit_message": "PR_TITLE",
+            "merge_commit_message": "PR_BODY",
             "merge_commit_title": "MERGE_MESSAGE",
             "name": "membership",
             "node_id": "R_kgDOLklIpA",