Merge pull request #23611 from github/repo-sync

repo sync

Author: Octomerger

components/page-header/Header.tsx

@@ -124,19 +124,20 @@ export const Header = () => {
                   className={cx(
                     isSearchOpen
                       ? styles.searchContainerWithOpenSearch
-                      : styles.searchContainerWithClosedSearch
+                      : styles.searchContainerWithClosedSearch,
+                    'mr-3'
                   )}
                 >
                   <Search />
                 </div>
               )}
 
-              <div className="d-none d-lg-flex flex-items-center ml-3">
+              <div className={cx('d-none d-lg-flex flex-items-center', signupCTAVisible && 'mr-3')}>
                 <LanguagePicker />
               </div>
 
               {signupCTAVisible && (
-                <div data-testid="header-signup" className="border-left ml-3">
+                <div data-testid="header-signup" className="border-left">
                   <a
                     href="https://github.com/signup?ref_cta=Sign+up&ref_loc=docs+header&ref_page=docs"
                     target="_blank"

lib/redirects/static/client-side-rest-api-redirects.json

@@ -154,6 +154,7 @@
   "/rest/enterprise-admin#set-self-hosted-runners-in-a-group-for-an-enterprise": "/rest/actions/self-hosted-runner-groups#set-self-hosted-runners-in-a-group-for-an-enterprise",
   "/rest/enterprise-admin#update-a-self-hosted-runner-group-for-an-enterprise": "/rest/actions/self-hosted-runner-groups#update-a-self-hosted-runner-group-for-an-enterprise",
   "/rest/orgs#list-custom-repository-roles-in-an-organization": "/rest/orgs/custom-roles#list-custom-repository-roles-in-an-organization",
+  "/rest/apps/oauth-applications#create-a-scoped-access-token": "/rest/apps/apps#create-a-scoped-access-token",
   "/rest/repos#deploy-keys": "/rest/deploy-keys",
   "/rest/deployments#deploy-keys": "/rest/deploy-keys",
   "/rest/repos#statuses": "/rest/commits/statuses",