Merge branch 'master' into sendToGitHub/make-colors-consistent

armadaproject · Dec 6, 2024 · 6c04fa1 · 6c04fa1
2 parents bb8e076 + 5d9c425
commit 6c04fa1
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 26 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -9,6 +9,6 @@ pull_request_rules:
           - "#approved-reviews-by>=2"
           - and: 
             - "#approved-reviews-by>=1"
-            - "author~=^(d80tb7|dave[-]gantenbein|dejanzele|eleanorpratt|JamesMurkin|masipauskas|MustafaI|zuqq|richscott|robertdavidsmith|samclark|suprjinx)"
+            - "author~=^(d80tb7|dave[-]gantenbein|dejanzele|eleanorpratt|JamesMurkin|mauriceyap|masipauskas|MustafaI|zuqq|richscott|robertdavidsmith|samclark|suprjinx)"
         title:
           Two are checks required.
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -2,31 +2,32 @@
 
 ## Current
 
-| Maintainer           | GitHub ID                                               | Affiliation |
-| -------------------- | ------------------------------------------------------- | ----------- |
-| Chris Martin         | [d80tb7](https://github.com/d80tb7)                     | G-Research  |
-| Dave Gantenbein      | [dave-gantenbein](https://github.com/dave-gantenbein)   | G-Research  |
-| Dejan Zele Pejchev   | [dejanzele](https://github.com/dejanzele)               | G-Research  |
-| Eleanor Pratt        | [eleanorpratt](https://github.com/eleanorpratt)         | G-Research  |
-| James Murkin         | [JamesMurkin](https://github.com/JamesMurkin)           | G-Research  |
-| Martynas Asipauskas  | [masipauskas](https://github.com/masipauskas)           | G-Research  |
-| Mustafa Ilyas        | [MustafaI](https://github.com/MustafaI)                 | G-Research  |
-| Noah Held            | [zuqq](https://github.com/zuqq)                         | G-Research  |
-| Rich Scott           | [richscott](https://github.com/richscott)               | G-Research  |
-| Robert Smith         | [robertdavidsmith](https://github.com/robertdavidsmith) | G-Research  |
-| Sam Clark            | [samclark](https://github.com/samclark)                 | G-Research  |
-| Geoffrey Wilson      | [suprjinx](https://github.com/suprjinx)                 | G-Research  |
+| Maintainer          | GitHub ID                                               | Affiliation |
+| ------------------- | ------------------------------------------------------- | ----------- |
+| Chris Martin        | [d80tb7](https://github.com/d80tb7)                     | G-Research  |
+| Dave Gantenbein     | [dave-gantenbein](https://github.com/dave-gantenbein)   | G-Research  |
+| Dejan Zele Pejchev  | [dejanzele](https://github.com/dejanzele)               | G-Research  |
+| Eleanor Pratt       | [eleanorpratt](https://github.com/eleanorpratt)         | G-Research  |
+| James Murkin        | [JamesMurkin](https://github.com/JamesMurkin)           | G-Research  |
+| Martynas Asipauskas | [masipauskas](https://github.com/masipauskas)           | G-Research  |
+| Maurice Yap         | [mauriceyap](https://github.com/mauriceyap)             | G-Research  |
+| Mustafa Ilyas       | [MustafaI](https://github.com/MustafaI)                 | G-Research  |
+| Noah Held           | [zuqq](https://github.com/zuqq)                         | G-Research  |
+| Rich Scott          | [richscott](https://github.com/richscott)               | G-Research  |
+| Robert Smith        | [robertdavidsmith](https://github.com/robertdavidsmith) | G-Research  |
+| Sam Clark           | [samclark](https://github.com/samclark)                 | G-Research  |
+| Geoffrey Wilson     | [suprjinx](https://github.com/suprjinx)                 | G-Research  |
 
 ## Past
 
-| Maintainer           | GitHub ID                                               | Affiliation |
-| -------------------- | ------------------------------------------------------- | ----------- |
-| Albin Severinson     | [severinson](https://github.com/severinson)             | G-Research  |
-| Alex Scammon         | [stackedsax](https://github.com/stackedsax)             | G-Research  |
-| Carlo Camurri        | [carlocamurri](https://github.com/carlocamurri)         | G-Research  |
-| Clifton Houck        | [ClifHouck](https://github.com/ClifHouck)               | G-Research  |
-| Daniel Rastelli      | [theAntiYeti](https://github.com/theAntiYeti)           | G-Research  |
-| Jamie Poole          | [jimbobby5](https://github.com/jimbobby5)               | G-Research  |
-| Kevin Hannon         | [kannon92](https://github.com/kannon92)                 | G-Research  |
-| Mark Sumner          | [msumner91](https://github.com/msumner91)               | G-Research  |
-| Mia Mijovic          | [mijovicmia](https://github.com/mijovicmia)             | G-Research  |
+| Maintainer       | GitHub ID                                       | Affiliation |
+| ---------------- | ----------------------------------------------- | ----------- |
+| Albin Severinson | [severinson](https://github.com/severinson)     | G-Research  |
+| Alex Scammon     | [stackedsax](https://github.com/stackedsax)     | G-Research  |
+| Carlo Camurri    | [carlocamurri](https://github.com/carlocamurri) | G-Research  |
+| Clifton Houck    | [ClifHouck](https://github.com/ClifHouck)       | G-Research  |
+| Daniel Rastelli  | [theAntiYeti](https://github.com/theAntiYeti)   | G-Research  |
+| Jamie Poole      | [jimbobby5](https://github.com/jimbobby5)       | G-Research  |
+| Kevin Hannon     | [kannon92](https://github.com/kannon92)         | G-Research  |
+| Mark Sumner      | [msumner91](https://github.com/msumner91)       | G-Research  |
+| Mia Mijovic      | [mijovicmia](https://github.com/mijovicmia)     | G-Research  |