From c8ffb0f5eb3add0dc7aba3fb834df2344e36e3e6 Mon Sep 17 00:00:00 2001
From: Jacob Ortiz <jacobortiz@SpaceCAMP213.local>
Date: Fri, 29 Apr 2022 14:15:43 -0400
Subject: [PATCH 1/4] updating issues templates for labels and process changes

---
 .gitlab/issue_templates/Application - Initial.md | 6 +++---
 .gitlab/issue_templates/Application - Update.md  | 9 ++-------
 .gitlab/issue_templates/Onboarding Question.md   | 5 +++--
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.gitlab/issue_templates/Application - Initial.md b/.gitlab/issue_templates/Application - Initial.md
index 4a0aa70..7a5f6a3 100644
--- a/.gitlab/issue_templates/Application - Initial.md	
+++ b/.gitlab/issue_templates/Application - Initial.md	
@@ -9,7 +9,7 @@ Contributor:
 - [ ] Ensure container builds successfully in the Iron Bank pipeline
 - [ ] Provide justifications for findings in the [VAT](https://vat.dso.mil) ([docs](https://repo1.dso.mil/dsop/dccscr/-/blob/master/pre-approval/vat.md))
 - [ ] Open a Merge Request from your branch to `development`
-- [ ] Apply the ~"Approval" label to this issue and wait for feedback
+- [ ] Apply the ~"Hardening::Review" label to this issue and wait for feedback
 
 Iron Bank:
 - [ ] Merge contributor branch to `development`
@@ -17,7 +17,7 @@ Iron Bank:
 - [ ] Send approval request to Authorizing Official
 - [ ] Merge `development` to `master` and close issue after approval from Authorizing Official
 
-> Note: If the above approval process is rejected for any reason, the `Approval` label will be removed and the issue will be sent back to `Open`. Any comments will be listed in this issue for you to address. Once they have been addressed, you **must** re-add the `Approval` label.
+> Note: If the above approval process is rejected for any reason, the `Hardening::Approval` label will be removed and the issue will be sent back to `Open`. Any comments will be listed in this issue for you to address. Once they have been addressed, you **must** re-add the `Hardening::Approval` label.
 
 ## Questions?
 
@@ -26,7 +26,7 @@ Contact the Iron Bank team by commenting on this issue with your questions or co
 Additionally, Iron Bank hosts an [AMA](https://www.zoomgov.com/meeting/register/vJIsf-ytpz8qHSN_JW8Hl9Qf0AZZXSCSmfo) working session every Wednesday from 1630-1730EST to answer questions.
 
 
-
+/label ~"Container::Initial"
 
 
 
diff --git a/.gitlab/issue_templates/Application - Update.md b/.gitlab/issue_templates/Application - Update.md
index a411b82..b08c757 100644
--- a/.gitlab/issue_templates/Application - Update.md	
+++ b/.gitlab/issue_templates/Application - Update.md	
@@ -11,7 +11,7 @@ Contributor:
 - [ ] Ensure container builds successfully in the Iron Bank pipeline
 - [ ] Provide justifications for findings in the [VAT](https://vat.dso.mil) ([docs](https://repo1.dso.mil/dsop/dccscr/-/blob/master/pre-approval/vat.md))
 - [ ] Open a Merge Request from your branch to `development`
-- [ ] Apply the ~"Approval" label to this issue and wait for feedback
+- [ ] Apply the ~"Hardening::Approval" label to this issue and wait for feedback
 
 Iron Bank:
 - [ ] Merge contributor branch to `development`
@@ -19,7 +19,7 @@ Iron Bank:
 - [ ] Send approval request to Authorizing Official
 - [ ] Merge `development` to `master` and close issue after approval from Authorizing Official
 
-> Note: If the above approval process is rejected for any reason, the `Approval` label will be removed and the issue will be sent back to `Open`. Any comments will be listed in this issue for you to address. Once they have been addressed, you **must** re-add the `Approval` label.
+> Note: If the above approval process is rejected for any reason, the `Hardening::Approval` label will be removed and the issue will be sent back to `Open`. Any comments will be listed in this issue for you to address. Once they have been addressed, you **must** re-add the `Hardening::Approval` label.
 
 ## Questions?
 
@@ -28,9 +28,4 @@ Contact the Iron Bank team by commenting on this issue with your questions or co
 Additionally, Iron Bank hosts an [AMA](https://www.zoomgov.com/meeting/register/vJIsf-ytpz8qHSN_JW8Hl9Qf0AZZXSCSmfo) working session every Wednesday from 1630-1730EST to answer questions.
 
 
-
-
-
-
-
 /label ~"Container::Update"
diff --git a/.gitlab/issue_templates/Onboarding Question.md b/.gitlab/issue_templates/Onboarding Question.md
index ae8011e..8dd13f1 100644
--- a/.gitlab/issue_templates/Onboarding Question.md	
+++ b/.gitlab/issue_templates/Onboarding Question.md	
@@ -8,5 +8,6 @@
 
 
 
-/label ~"Question::Onboarding" ~"To Do"
-/cc @ironbank-notifications/onboarding
\ No newline at end of file
+/label ~"Question::Onboarding" ~"CSO::To Do"
+/cc @ironbank-notifications/onboarding
+/assign @ironbank-notifications/onboarding
\ No newline at end of file
-- 
GitLab


From e00b6bfb201ec21672348298bf0a09063fe03c50 Mon Sep 17 00:00:00 2001
From: Jacob Ortiz <jacobortiz@SpaceCAMP213.local>
Date: Fri, 29 Apr 2022 14:33:21 -0400
Subject: [PATCH 2/4] fixing mistakes

---
 .gitlab/issue_templates/Access Request.md        | 16 ++++++++++------
 .gitlab/issue_templates/Application - Initial.md |  4 ----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitlab/issue_templates/Access Request.md b/.gitlab/issue_templates/Access Request.md
index b9fd83b..257233b 100644
--- a/.gitlab/issue_templates/Access Request.md	
+++ b/.gitlab/issue_templates/Access Request.md	
@@ -2,18 +2,22 @@
 
 The following individuals are requesting access to this project (one per line):
 (Tag all individuals here)
+
 - Tag here
 
 The access level should be:
 - [ ] Developer access
 - [ ] Remove access
 
+Dose the member need access to the VAT? (https://vat.dso.mil/vat)
+- [ ] Yes
+- [ ] No
 
-## Definition of Done
-- [ ] All accounts have been provided the necessary accesses
-
-
-
+## Iron Bank Tasks
+- [ ] All accounts have been provided the necessary accesses to the projects
+- [ ] All accounts have been provided the necessary accesses to the VAT (optional)
 
 
-/label ~"Access Request" ~"To Do" ~"Owner::Ironbank"
+/label ~"Access Request::Repo" ~"CSO::To Do" ~"Owner::Ironbank"
+/cc @ironbank-notifications/onboarding
+/assign @ironbank-notifications/onboarding
\ No newline at end of file
diff --git a/.gitlab/issue_templates/Application - Initial.md b/.gitlab/issue_templates/Application - Initial.md
index 7a5f6a3..0c90d41 100644
--- a/.gitlab/issue_templates/Application - Initial.md	
+++ b/.gitlab/issue_templates/Application - Initial.md	
@@ -28,7 +28,3 @@ Additionally, Iron Bank hosts an [AMA](https://www.zoomgov.com/meeting/register/
 
 /label ~"Container::Initial"
 
-
-
-
-/label ~"Container::Initial"
-- 
GitLab


From 0a37ae4cff5a35fff4fc4e8d981568a24ea34e78 Mon Sep 17 00:00:00 2001
From: Adam Martin <adam.martin@rancherfederal.com>
Date: Fri, 29 Apr 2022 19:23:18 +0000
Subject: [PATCH 3/4] Apply 1 suggestion(s) to 1 file(s)

---
 .gitlab/issue_templates/Access Request.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab/issue_templates/Access Request.md b/.gitlab/issue_templates/Access Request.md
index 257233b..d62d3fb 100644
--- a/.gitlab/issue_templates/Access Request.md	
+++ b/.gitlab/issue_templates/Access Request.md	
@@ -9,7 +9,7 @@ The access level should be:
 - [ ] Developer access
 - [ ] Remove access
 
-Dose the member need access to the VAT? (https://vat.dso.mil/vat)
+Does the member need access to the VAT? (https://vat.dso.mil/vat)
 - [ ] Yes
 - [ ] No
 
-- 
GitLab


From 34e5ea07977745ab120275847d375a438c472704 Mon Sep 17 00:00:00 2001
From: David Freeman <davidfreeman@seed-innovations.com>
Date: Wed, 11 May 2022 19:19:47 +0000
Subject: [PATCH 4/4] Update label

---
 .gitlab/issue_templates/Application - Update.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab/issue_templates/Application - Update.md b/.gitlab/issue_templates/Application - Update.md
index b08c757..69d6d95 100644
--- a/.gitlab/issue_templates/Application - Update.md	
+++ b/.gitlab/issue_templates/Application - Update.md	
@@ -11,7 +11,7 @@ Contributor:
 - [ ] Ensure container builds successfully in the Iron Bank pipeline
 - [ ] Provide justifications for findings in the [VAT](https://vat.dso.mil) ([docs](https://repo1.dso.mil/dsop/dccscr/-/blob/master/pre-approval/vat.md))
 - [ ] Open a Merge Request from your branch to `development`
-- [ ] Apply the ~"Hardening::Approval" label to this issue and wait for feedback
+- [ ] Apply the ~"Hardening::Review" label to this issue and wait for feedback
 
 Iron Bank:
 - [ ] Merge contributor branch to `development`
-- 
GitLab