Merge pull request github#34036 from github/repo-sync

Repo sync
mohammadzolfali · Jul 20, 2024 · 89e2759 · 89e2759
2 parents 203561a + bf3857c
commit 89e2759
Show file tree

Hide file tree

Showing 21 changed files with 405 additions and 4,452 deletions.
diff --git a/...eping-your-account-and-data-secure/removing-sensitive-data-from-a-repository.md b/...eping-your-account-and-data-secure/removing-sensitive-data-from-a-repository.md
@@ -188,10 +188,11 @@ After using either the BFG tool or `git filter-repo` to remove the sensitive dat
 
 1. Tell your collaborators to [rebase](https://git-scm.com/book/en/Git-Branching-Rebasing), _not_ merge, any branches they created off of your old (tainted) repository history. One merge commit could reintroduce some or all of the tainted history that you just went to the trouble of purging.
 
-1. After some time has passed and you're confident that the BFG tool / `git filter-repo` had no unintended side effects, you can force all objects in your local repository to be dereferenced and garbage collected with the following commands (using Git 1.8.5 or newer):
+1. If you used `git filter-repo`, you can skip this step.
+
+   If you used the BFG tool, after rewriting, you can clean up references in your local repository to the old history to be dereferenced and garbage collected with the following commands (using Git 1.8.5 or newer):
 
    ```shell
-   $ git for-each-ref --format="delete %(refname)" refs/original | git update-ref --stdin
    $ git reflog expire --expire=now --all
    $ git gc --prune=now
    > Counting objects: 2437, done.

diff --git a/content/rest/orgs/organization-roles.md b/content/rest/orgs/organization-roles.md
@@ -5,7 +5,6 @@ intro: Use the REST API to interact with organization roles.
 versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
   fpt: '*'
   ghec: '*'
-  ghes: '>=3.13'
 topics:
   - API
 autogenerated: rest

diff --git a/src/github-apps/data/fpt-2022-11-28/fine-grained-pat-permissions.json b/src/github-apps/data/fpt-2022-11-28/fine-grained-pat-permissions.json
@@ -534,15 +534,6 @@
     "title": "Custom organization roles",
     "displayTitle": "Organization permissions for \"Custom organization roles\"",
     "permissions": [
-      {
-        "category": "orgs",
-        "slug": "list-organization-fine-grained-permissions-for-an-organization",
-        "subcategory": "organization-roles",
-        "verb": "get",
-        "requestPath": "/orgs/{org}/organization-fine-grained-permissions",
-        "additional-permissions": false,
-        "access": "read"
-      },
       {
         "category": "orgs",
         "slug": "get-all-organization-roles-for-an-organization",
@@ -552,15 +543,6 @@
         "additional-permissions": false,
         "access": "read"
       },
-      {
-        "category": "orgs",
-        "slug": "create-a-custom-organization-role",
-        "subcategory": "organization-roles",
-        "verb": "post",
-        "requestPath": "/orgs/{org}/organization-roles",
-        "additional-permissions": false,
-        "access": "write"
-      },
       {
         "category": "orgs",
         "slug": "get-an-organization-role",
@@ -569,24 +551,6 @@
         "requestPath": "/orgs/{org}/organization-roles/{role_id}",
         "additional-permissions": false,
         "access": "read"
-      },
-      {
-        "category": "orgs",
-        "slug": "update-a-custom-organization-role",
-        "subcategory": "organization-roles",
-        "verb": "patch",
-        "requestPath": "/orgs/{org}/organization-roles/{role_id}",
-        "additional-permissions": false,
-        "access": "write"
-      },
-      {
-        "category": "orgs",
-        "slug": "delete-a-custom-organization-role",
-        "subcategory": "organization-roles",
-        "verb": "delete",
-        "requestPath": "/orgs/{org}/organization-roles/{role_id}",
-        "additional-permissions": false,
-        "access": "write"
       }
     ]
   },

diff --git a/src/github-apps/data/fpt-2022-11-28/fine-grained-pat.json b/src/github-apps/data/fpt-2022-11-28/fine-grained-pat.json
@@ -3136,24 +3136,12 @@
       "verb": "delete",
       "requestPath": "/orgs/{org}/memberships/{username}"
     },
-    {
-      "slug": "list-organization-fine-grained-permissions-for-an-organization",
-      "subcategory": "organization-roles",
-      "verb": "get",
-      "requestPath": "/orgs/{org}/organization-fine-grained-permissions"
-    },
     {
       "slug": "get-all-organization-roles-for-an-organization",
       "subcategory": "organization-roles",
       "verb": "get",
       "requestPath": "/orgs/{org}/organization-roles"
     },
-    {
-      "slug": "create-a-custom-organization-role",
-      "subcategory": "organization-roles",
-      "verb": "post",
-      "requestPath": "/orgs/{org}/organization-roles"
-    },
     {
       "slug": "remove-all-organization-roles-for-a-team",
       "subcategory": "organization-roles",
@@ -3196,18 +3184,6 @@
       "verb": "get",
       "requestPath": "/orgs/{org}/organization-roles/{role_id}"
     },
-    {
-      "slug": "update-a-custom-organization-role",
-      "subcategory": "organization-roles",
-      "verb": "patch",
-      "requestPath": "/orgs/{org}/organization-roles/{role_id}"
-    },
-    {
-      "slug": "delete-a-custom-organization-role",
-      "subcategory": "organization-roles",
-      "verb": "delete",
-      "requestPath": "/orgs/{org}/organization-roles/{role_id}"
-    },
     {
       "slug": "list-teams-that-are-assigned-to-an-organization-role",
       "subcategory": "organization-roles",

diff --git a/src/github-apps/data/fpt-2022-11-28/server-to-server-permissions.json b/src/github-apps/data/fpt-2022-11-28/server-to-server-permissions.json
@@ -670,17 +670,6 @@
     "title": "Custom organization roles",
     "displayTitle": "Organization permissions for \"Custom organization roles\"",
     "permissions": [
-      {
-        "category": "orgs",
-        "slug": "list-organization-fine-grained-permissions-for-an-organization",
-        "subcategory": "organization-roles",
-        "verb": "get",
-        "requestPath": "/orgs/{org}/organization-fine-grained-permissions",
-        "access": "read",
-        "user-to-server": true,
-        "server-to-server": true,
-        "additional-permissions": false
-      },
       {
         "category": "orgs",
         "slug": "get-all-organization-roles-for-an-organization",
@@ -692,17 +681,6 @@
         "server-to-server": true,
         "additional-permissions": false
       },
-      {
-        "category": "orgs",
-        "slug": "create-a-custom-organization-role",
-        "subcategory": "organization-roles",
-        "verb": "post",
-        "requestPath": "/orgs/{org}/organization-roles",
-        "access": "write",
-        "user-to-server": true,
-        "server-to-server": true,
-        "additional-permissions": false
-      },
       {
         "category": "orgs",
         "slug": "get-an-organization-role",
@@ -713,28 +691,6 @@
         "user-to-server": true,
         "server-to-server": true,
         "additional-permissions": false
-      },
-      {
-        "category": "orgs",
-        "slug": "update-a-custom-organization-role",
-        "subcategory": "organization-roles",
-        "verb": "patch",
-        "requestPath": "/orgs/{org}/organization-roles/{role_id}",
-        "access": "write",
-        "user-to-server": true,
-        "server-to-server": true,
-        "additional-permissions": false
-      },
-      {
-        "category": "orgs",
-        "slug": "delete-a-custom-organization-role",
-        "subcategory": "organization-roles",
-        "verb": "delete",
-        "requestPath": "/orgs/{org}/organization-roles/{role_id}",
-        "access": "write",
-        "user-to-server": true,
-        "server-to-server": true,
-        "additional-permissions": false
       }
     ]
   },

diff --git a/src/github-apps/data/fpt-2022-11-28/server-to-server-rest.json b/src/github-apps/data/fpt-2022-11-28/server-to-server-rest.json
@@ -2656,24 +2656,12 @@
       "verb": "delete",
       "requestPath": "/orgs/{org}/memberships/{username}"
     },
-    {
-      "slug": "list-organization-fine-grained-permissions-for-an-organization",
-      "subcategory": "organization-roles",
-      "verb": "get",
-      "requestPath": "/orgs/{org}/organization-fine-grained-permissions"
-    },
     {
       "slug": "get-all-organization-roles-for-an-organization",
       "subcategory": "organization-roles",
       "verb": "get",
       "requestPath": "/orgs/{org}/organization-roles"
     },
-    {
-      "slug": "create-a-custom-organization-role",
-      "subcategory": "organization-roles",
-      "verb": "post",
-      "requestPath": "/orgs/{org}/organization-roles"
-    },
     {
       "slug": "remove-all-organization-roles-for-a-team",
       "subcategory": "organization-roles",
@@ -2716,18 +2704,6 @@
       "verb": "get",
       "requestPath": "/orgs/{org}/organization-roles/{role_id}"
     },
-    {
-      "slug": "update-a-custom-organization-role",
-      "subcategory": "organization-roles",
-      "verb": "patch",
-      "requestPath": "/orgs/{org}/organization-roles/{role_id}"
-    },
-    {
-      "slug": "delete-a-custom-organization-role",
-      "subcategory": "organization-roles",
-      "verb": "delete",
-      "requestPath": "/orgs/{org}/organization-roles/{role_id}"
-    },
     {
       "slug": "list-teams-that-are-assigned-to-an-organization-role",
       "subcategory": "organization-roles",

diff --git a/src/github-apps/data/fpt-2022-11-28/user-to-server-rest.json b/src/github-apps/data/fpt-2022-11-28/user-to-server-rest.json
@@ -3136,24 +3136,12 @@
       "verb": "delete",
       "requestPath": "/orgs/{org}/memberships/{username}"
     },
-    {
-      "slug": "list-organization-fine-grained-permissions-for-an-organization",
-      "subcategory": "organization-roles",
-      "verb": "get",
-      "requestPath": "/orgs/{org}/organization-fine-grained-permissions"
-    },
     {
       "slug": "get-all-organization-roles-for-an-organization",
       "subcategory": "organization-roles",
       "verb": "get",
       "requestPath": "/orgs/{org}/organization-roles"
     },
-    {
-      "slug": "create-a-custom-organization-role",
-      "subcategory": "organization-roles",
-      "verb": "post",
-      "requestPath": "/orgs/{org}/organization-roles"
-    },
     {
       "slug": "remove-all-organization-roles-for-a-team",
       "subcategory": "organization-roles",
@@ -3196,18 +3184,6 @@
       "verb": "get",
       "requestPath": "/orgs/{org}/organization-roles/{role_id}"
     },
-    {
-      "slug": "update-a-custom-organization-role",
-      "subcategory": "organization-roles",
-      "verb": "patch",
-      "requestPath": "/orgs/{org}/organization-roles/{role_id}"
-    },
-    {
-      "slug": "delete-a-custom-organization-role",
-      "subcategory": "organization-roles",
-      "verb": "delete",
-      "requestPath": "/orgs/{org}/organization-roles/{role_id}"
-    },
     {
       "slug": "list-teams-that-are-assigned-to-an-organization-role",
       "subcategory": "organization-roles",