From c1623f665146812b51dedab77a9b4c7b02e2e91f Mon Sep 17 00:00:00 2001 From: Ethan Palm <56270045+ethanpalm@users.noreply.github.com> Date: Tue, 8 Feb 2022 15:17:45 -0800 Subject: [PATCH] Version fix for new settings UI (#25098) * Reversion org settings * Reversion settings * Reversion teams settings * Reversion repo settings * Update elsif tags --- .../inviting-collaborators-to-a-personal-repository.md | 2 +- .../removing-a-collaborator-from-a-personal-repository.md | 2 +- .../removing-yourself-from-a-collaborators-repository.md | 2 +- .../reviewing-your-deploy-keys.md | 2 +- .../reviewing-your-security-log.md | 2 +- .../reviewing-your-organizations-installed-integrations.md | 4 ++-- ...side-collaborators-to-repositories-in-your-organization.md | 2 +- ...ing-an-individuals-access-to-an-organization-repository.md | 4 ++-- .../disabling-project-boards-in-your-organization.md | 2 +- .../integrating-jira-with-your-organization-project-board.md | 4 ++-- .../managing-code-review-settings-for-your-team.md | 4 ++-- .../configuring-autolinks-to-reference-external-resources.md | 2 +- data/reusables/audit_log/audit_log_sidebar_for_org_admins.md | 2 +- data/reusables/audit_log/audit_log_sidebar_for_site_admins.md | 2 +- data/reusables/dependabot/dependabot-secrets-button.md | 4 ++-- data/reusables/github-actions/sidebar-secret.md | 4 ++-- data/reusables/organizations/billing_plans.md | 4 ++-- data/reusables/organizations/github-apps-settings-sidebar.md | 4 ++-- data/reusables/organizations/member-privileges.md | 4 ++-- data/reusables/organizations/repository-defaults.md | 4 ++-- data/reusables/organizations/security-and-analysis.md | 4 ++-- data/reusables/organizations/security.md | 2 +- data/reusables/organizations/teams_sidebar.md | 2 +- data/reusables/organizations/verified-domains.md | 4 ++-- data/reusables/pages/sidebar-pages.md | 2 +- .../repositories/navigate-to-security-and-analysis.md | 4 ++-- data/reusables/repositories/repository-branches.md | 4 ++-- data/reusables/repositories/sidebar-notifications.md | 2 +- data/reusables/user_settings/access_applications.md | 2 +- data/reusables/user_settings/account_settings.md | 2 +- data/reusables/user_settings/appearance-settings.md | 2 +- data/reusables/user_settings/developer_settings.md | 2 +- data/reusables/user_settings/emails.md | 2 +- data/reusables/user_settings/organizations.md | 2 +- data/reusables/user_settings/repo-tab.md | 2 +- data/reusables/user_settings/saved_replies.md | 2 +- data/reusables/user_settings/security-analysis.md | 2 +- data/reusables/user_settings/security.md | 2 +- data/reusables/user_settings/ssh.md | 2 +- 39 files changed, 53 insertions(+), 53 deletions(-) diff --git a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/inviting-collaborators-to-a-personal-repository.md b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/inviting-collaborators-to-a-personal-repository.md index 6b8b438787..e529d774e8 100644 --- a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/inviting-collaborators-to-a-personal-repository.md +++ b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/inviting-collaborators-to-a-personal-repository.md @@ -37,7 +37,7 @@ If you're a member of an {% data variables.product.prodname_emu_enterprise %}, y 1. Ask for the username of the person you're inviting as a collaborator.{% ifversion fpt or ghec %} If they don't have a username yet, they can sign up for {% data variables.product.prodname_dotcom %} For more information, see "[Signing up for a new {% data variables.product.prodname_dotcom %} account](/articles/signing-up-for-a-new-github-account)".{% endif %} {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658%} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658%} {% data reusables.repositories.click-collaborators-teams %} 1. Click **Invite a collaborator**. !["Invite a collaborator" button](/assets/images/help/repository/invite-a-collaborator-button.png) diff --git a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/removing-a-collaborator-from-a-personal-repository.md b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/removing-a-collaborator-from-a-personal-repository.md index 423f53ac6b..46a1815b00 100644 --- a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/removing-a-collaborator-from-a-personal-repository.md +++ b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/removing-a-collaborator-from-a-personal-repository.md @@ -29,7 +29,7 @@ While forks of private repositories are deleted when a collaborator is removed, {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} {% data reusables.repositories.click-collaborators-teams %} 4. To the right of the collaborator you want to remove, click {% octicon "trash" aria-label="The trash icon" %}. ![Button to remove collaborator](/assets/images/help/repository/collaborator-remove.png) diff --git a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/removing-yourself-from-a-collaborators-repository.md b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/removing-yourself-from-a-collaborators-repository.md index d0aef51457..9083c088b7 100644 --- a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/removing-yourself-from-a-collaborators-repository.md +++ b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/removing-yourself-from-a-collaborators-repository.md @@ -20,7 +20,7 @@ topics: shortTitle: Remove yourself --- {% data reusables.user_settings.access_settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 2. In the "Code, planning, and automation" section of the sidebar, click **{% octicon "repo" aria-label="The repo icon" %} Repositories**. {% else %} 2. In the left sidebar, click **Repositories**. diff --git a/content/authentication/keeping-your-account-and-data-secure/reviewing-your-deploy-keys.md b/content/authentication/keeping-your-account-and-data-secure/reviewing-your-deploy-keys.md index 7fef226524..ebba929003 100644 --- a/content/authentication/keeping-your-account-and-data-secure/reviewing-your-deploy-keys.md +++ b/content/authentication/keeping-your-account-and-data-secure/reviewing-your-deploy-keys.md @@ -17,7 +17,7 @@ shortTitle: Deploy keys --- {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 3. In the "Security" section of the sidebar, click **{% octicon "key" aria-label="The key icon" %} Deploy keys**. {% else %} 3. In the left sidebar, click **Deploy keys**. diff --git a/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md b/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md index 7c4aa867d4..03a5ca35b7 100644 --- a/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md +++ b/content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md @@ -21,7 +21,7 @@ shortTitle: Security log The security log lists all actions performed within the last 90 days. {% data reusables.user_settings.access_settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Archives" section of the sidebar, click **{% octicon "log" aria-label="The log icon" %} Security log**. {% else %} 1. In the user settings sidebar, click **Security log**. diff --git a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-your-organizations-installed-integrations.md b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-your-organizations-installed-integrations.md index ad7be37a60..72722f6626 100644 --- a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-your-organizations-installed-integrations.md +++ b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-your-organizations-installed-integrations.md @@ -19,9 +19,9 @@ shortTitle: Review installed integrations {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Integrations" section of the sidebar, click **{% octicon "apps" aria-label="The apps icon" %} {% data variables.product.prodname_github_apps %}**. -{% elsif ghae or ghes < 3.4 %} +{% else %} 1. In the left sidebar, click **Installed {% data variables.product.prodname_github_apps %}**. ![Installed {% data variables.product.prodname_github_apps %} tab in the organization settings sidebar](/assets/images/help/organizations/org-settings-installed-github-apps.png) {% endif %} diff --git a/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md b/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md index 172b741d51..e08fcb498f 100644 --- a/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md @@ -40,7 +40,7 @@ To further support your team's collaboration abilities, you can upgrade to {% da {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} {% data reusables.repositories.click-collaborators-teams %} {% data reusables.organizations.invite-teams-or-people %} 5. In the search field, start typing the name of person you want to invite, then click a name in the list of matches. diff --git a/content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md b/content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md index dca2061c91..175582a2d2 100644 --- a/content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md @@ -28,9 +28,9 @@ When you remove a collaborator from a repository in your organization, the colla {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} {% data reusables.repositories.click-collaborators-teams %} -{% elsif ghes < 3.4 or ghae %} +{% else %} {% data reusables.repositories.navigate-to-manage-access %} {% endif %} {% data reusables.organizations.invite-teams-or-people %} diff --git a/content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md b/content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md index 69be8ae11c..c83355b58f 100644 --- a/content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md +++ b/content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md @@ -23,7 +23,7 @@ When you disable project boards, you will no longer see project board informatio {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Code planning, and automation" section of the sidebar, click **{% octicon "table" aria-label="The table icon" %} Projects**. {% endif %} 1. Decide whether to disable organization-wide project boards, disable repository project boards in the organization, or both. Then, under "Projects": diff --git a/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md b/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md index 4d62131020..9a7937c0b6 100644 --- a/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md +++ b/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md @@ -9,13 +9,13 @@ versions: ghae: '*' shortTitle: Integrate Jira --- -{% ifversion ghes > 3.3 or ghae-issue-5658 %} +{% ifversion ghes > 3.4 or ghae-issue-5658 %} {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} 1. In the left sidebar, select **{% octicon "code" aria-label="The code icon" %} Developer settings**, then click **OAuth Apps**. ![OAuth applications tab in the left sidebar](/assets/images/help/organizations/org-oauth-applications-ghe.png) 1. Click **New OAuth App**. -{% elsif ghes < 3.4 or ghae %} +{% else %} {% data reusables.user_settings.access_settings %} 1. In the left sidebar under **Organization settings**, click the name of your organization. ![Sidebar organization name](/assets/images/help/settings/organization-settings-from-sidebar.png) diff --git a/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md b/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md index 8cb00329e2..4e14267508 100644 --- a/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md +++ b/content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md @@ -57,7 +57,7 @@ Any team members that have set their status to "Busy" will not be selected for r {% data reusables.user_settings.access_org %} {% data reusables.organizations.specific_team %} {% data reusables.organizations.team_settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the left sidebar, click **{% octicon "code-review" aria-label="The code-review icon" %} Code review**. {% else %} 1. In the left sidebar, click **Code review** @@ -73,7 +73,7 @@ Any team members that have set their status to "Busy" will not be selected for r {% data reusables.user_settings.access_org %} {% data reusables.organizations.specific_team %} {% data reusables.organizations.team_settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the left sidebar, click **{% octicon "code-review" aria-label="The code-review icon" %} Code review**. {% else %} 1. In the left sidebar, click **Code review** diff --git a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-autolinks-to-reference-external-resources.md b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-autolinks-to-reference-external-resources.md index 374e9a889b..1ba761c11c 100644 --- a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-autolinks-to-reference-external-resources.md +++ b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-autolinks-to-reference-external-resources.md @@ -21,7 +21,7 @@ If you use Zendesk to track user-reported tickets, for example, you can referenc {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Integrations" section of the sidebar, click **{% octicon "cross-reference" aria-label="The cross-reference icon" %} Autolink references**. {% else %} 1. In the left sidebar, click **Autolink references**. diff --git a/data/reusables/audit_log/audit_log_sidebar_for_org_admins.md b/data/reusables/audit_log/audit_log_sidebar_for_org_admins.md index d8ec9ca1bb..6cc2c183fd 100644 --- a/data/reusables/audit_log/audit_log_sidebar_for_org_admins.md +++ b/data/reusables/audit_log/audit_log_sidebar_for_org_admins.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Archives" section of the sidebar, click **{% octicon "log" aria-label="The log icon" %} Security log**. {% else %} 1. In the Settings sidebar, click **Audit log**. diff --git a/data/reusables/audit_log/audit_log_sidebar_for_site_admins.md b/data/reusables/audit_log/audit_log_sidebar_for_site_admins.md index a717da6991..a6e00e1dc8 100644 --- a/data/reusables/audit_log/audit_log_sidebar_for_site_admins.md +++ b/data/reusables/audit_log/audit_log_sidebar_for_site_admins.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 3. In the "Archives" section of the sidebar, click **{% octicon "log" aria-label="The log icon" %} Security log**. {% else %} 3. In the left sidebar, click **Audit log**. diff --git a/data/reusables/dependabot/dependabot-secrets-button.md b/data/reusables/dependabot/dependabot-secrets-button.md index 72625bc19f..cb57bb6485 100644 --- a/data/reusables/dependabot/dependabot-secrets-button.md +++ b/data/reusables/dependabot/dependabot-secrets-button.md @@ -1,6 +1,6 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Security" section of the sidebar, select **{% octicon "key-asterisk" aria-label="The key-asterisk icon" %} Secrets**, then click **{% data variables.product.prodname_dependabot %}**. -{% elsif ghes > 3.2%} +{% else %} 1. In the sidebar, click **{% data variables.product.prodname_dependabot %}**. ![{% data variables.product.prodname_dependabot %} secrets sidebar option](/assets/images/enterprise/3.3/dependabot/dependabot-secrets.png) {% endif %} diff --git a/data/reusables/github-actions/sidebar-secret.md b/data/reusables/github-actions/sidebar-secret.md index f5c22b01b3..896d920ff4 100644 --- a/data/reusables/github-actions/sidebar-secret.md +++ b/data/reusables/github-actions/sidebar-secret.md @@ -1,5 +1,5 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the left sidebar, click **{% octicon "key-asterisk" aria-label="The key-asterisk icon" %} Secrets**. -{% elsif ghes < 3.4 or ghae %} +{% else %} 1. In the left sidebar, click **Secrets**. {% endif %} diff --git a/data/reusables/organizations/billing_plans.md b/data/reusables/organizations/billing_plans.md index 0d48d771db..35dc04461a 100644 --- a/data/reusables/organizations/billing_plans.md +++ b/data/reusables/organizations/billing_plans.md @@ -1,6 +1,6 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-label="The credit card icon" %} Billing and plans**. -{% elsif ghes < 3.4 or ghae %} +{% else %} 1. In your organization's Settings sidebar, click **Billing & plans**. ![Billing settings](/assets/images/help/billing/settings_organization_billing_plans_tab.png) {% endif %} diff --git a/data/reusables/organizations/github-apps-settings-sidebar.md b/data/reusables/organizations/github-apps-settings-sidebar.md index e130e6b624..1e835a9141 100644 --- a/data/reusables/organizations/github-apps-settings-sidebar.md +++ b/data/reusables/organizations/github-apps-settings-sidebar.md @@ -1,6 +1,6 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the left sidebar, select **{% octicon "code" aria-label="The code icon" %} Developer settings** then click **{% data variables.product.prodname_github_apps %}**. -{% elsif ghes < 3.4 or ghae %} +{% else %} 1. In the left sidebar, click **{% data variables.product.prodname_github_apps %}**. ![{% data variables.product.prodname_github_apps %} settings](/assets/images/help/organizations/github-apps-settings-sidebar.png) {% endif %} diff --git a/data/reusables/organizations/member-privileges.md b/data/reusables/organizations/member-privileges.md index 96da580be3..66589d5bad 100644 --- a/data/reusables/organizations/member-privileges.md +++ b/data/reusables/organizations/member-privileges.md @@ -1,6 +1,6 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Access" section of the sidebar, click **{% octicon "people" aria-label="The people icon" %} Member privileges**. -{% elsif ghae or ghes < 3.4 %} +{% else %} 4. In the left sidebar, click **Member privileges**. ![Member privileges option in org settings](/assets/images/help/organizations/org-settings-member-privileges.png) {% endif %} diff --git a/data/reusables/organizations/repository-defaults.md b/data/reusables/organizations/repository-defaults.md index 05d921fb76..0356b367d1 100644 --- a/data/reusables/organizations/repository-defaults.md +++ b/data/reusables/organizations/repository-defaults.md @@ -1,6 +1,6 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Code, planning, and automation" section of the sidebar, select **{% octicon "repo" aria-label="The repo icon" %} Repository**, then click **Repository defaults**. -{% elsif ghes < 3.4 or ghae %} +{% else %} 1. In the left sidebar, click **Repository defaults**. ![Repository defaults tab](/assets/images/help/organizations/repo-defaults-tab.png) {% endif %} diff --git a/data/reusables/organizations/security-and-analysis.md b/data/reusables/organizations/security-and-analysis.md index 9ab6f7bfe5..a641b5b0fd 100644 --- a/data/reusables/organizations/security-and-analysis.md +++ b/data/reusables/organizations/security-and-analysis.md @@ -1,6 +1,6 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Security" section of the sidebar, click **{% octicon "codescan" aria-label="The codescan icon" %} Code security and analysis**. -{% elsif ghes < 3.4 or ghae %} +{% else %} 1. In the left sidebar, click **Security & analysis**. !["Security & analysis" tab in organization settings](/assets/images/help/organizations/org-settings-security-and-analysis.png) {% endif %} diff --git a/data/reusables/organizations/security.md b/data/reusables/organizations/security.md index 049c20a7b9..31ea8e9ce9 100644 --- a/data/reusables/organizations/security.md +++ b/data/reusables/organizations/security.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Security" section of the sidebar, click **{% octicon "shield-lock" aria-label="The shield-lock icon" %} Authentication security**. {% else %} 1. In the left sidebar, click **Organization security**. diff --git a/data/reusables/organizations/teams_sidebar.md b/data/reusables/organizations/teams_sidebar.md index 338fe6bc8e..812304b4bc 100644 --- a/data/reusables/organizations/teams_sidebar.md +++ b/data/reusables/organizations/teams_sidebar.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Access" section of the sidebar, click **{% octicon "comment-discussion" aria-label="The comment-discussion icon" %} Team discussions**. {% else %} 1. In the Settings sidebar, click **Teams**. diff --git a/data/reusables/organizations/verified-domains.md b/data/reusables/organizations/verified-domains.md index 83b44b4715..079ac23d2d 100644 --- a/data/reusables/organizations/verified-domains.md +++ b/data/reusables/organizations/verified-domains.md @@ -1,6 +1,6 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Security" section of the sidebar, click **{% octicon "verified" aria-label="The verified icon" %} Verified and approved domains**. -{% elsif ghes < 3.4 or ghae %} +{% else %} 1. In the left sidebar, click **Verified & approved domains**. !["Verified & approved domains" tab](/assets/images/help/organizations/verified-domains-button.png) {% endif %} diff --git a/data/reusables/pages/sidebar-pages.md b/data/reusables/pages/sidebar-pages.md index 03ae79d84f..61e7afdbb2 100644 --- a/data/reusables/pages/sidebar-pages.md +++ b/data/reusables/pages/sidebar-pages.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghes > 3.3 or ghec or ghae-issue-5658 %} +{% ifversion fpt or ghes > 3.4 or ghec or ghae-issue-5658 %} 1. In the "Code & operations" section of the sidebar, click **{% octicon "browser" aria-label="The browser icon" %} Pages**. {% else %} 1. In the left sidebar, click **Pages**. diff --git a/data/reusables/repositories/navigate-to-security-and-analysis.md b/data/reusables/repositories/navigate-to-security-and-analysis.md index 2407a1cd4f..79b226c3b5 100644 --- a/data/reusables/repositories/navigate-to-security-and-analysis.md +++ b/data/reusables/repositories/navigate-to-security-and-analysis.md @@ -1,6 +1,6 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Security" section of the sidebar, click **{% octicon "shield-lock" aria-label="The shield-lock icon" %} Security & analysis**. -{% elsif ghes < 3.4 or ghae %} +{% else %} 1. In the left sidebar, click **Security & analysis**. !["Security & analysis" tab in repository settings](/assets/images/help/repository/security-and-analysis-tab.png) {% endif %} diff --git a/data/reusables/repositories/repository-branches.md b/data/reusables/repositories/repository-branches.md index a004e202d0..c51576f4ff 100644 --- a/data/reusables/repositories/repository-branches.md +++ b/data/reusables/repositories/repository-branches.md @@ -1,6 +1,6 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Code & operations" section of the sidebar, click **{% octicon "git-branch" aria-label="The git-branch icon" %} Branches**. -{% elsif ghes < 3.4 or ghae %} +{% else %} 1. In the left menu, click **Branches**. ![Repository options sub-menu](/assets/images/help/repository/repository-options-branch.png) {% endif %} diff --git a/data/reusables/repositories/sidebar-notifications.md b/data/reusables/repositories/sidebar-notifications.md index 1a5edf0d3d..ab2fd8d2be 100644 --- a/data/reusables/repositories/sidebar-notifications.md +++ b/data/reusables/repositories/sidebar-notifications.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Integrations" section of the sidebar, click **{% octicon "mail" aria-label="The mail icon" %} Email notifications**. {% else %} 1. Click **Notifications**. diff --git a/data/reusables/user_settings/access_applications.md b/data/reusables/user_settings/access_applications.md index efc6abe024..812666b807 100644 --- a/data/reusables/user_settings/access_applications.md +++ b/data/reusables/user_settings/access_applications.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Integrations" section of the sidebar, click **{% octicon "apps" aria-label="The apps icon" %} Applications**. {% else %} 1. In the left sidebar, click **Applications**. diff --git a/data/reusables/user_settings/account_settings.md b/data/reusables/user_settings/account_settings.md index 7edd6e2f14..10074924fe 100644 --- a/data/reusables/user_settings/account_settings.md +++ b/data/reusables/user_settings/account_settings.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-next %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-next %} 1. In the left sidebar, click **{% octicon "gear" aria-label="The gear icon" %} Account**. {% else %} 1. In the left sidebar, click **Account**. diff --git a/data/reusables/user_settings/appearance-settings.md b/data/reusables/user_settings/appearance-settings.md index d201a2de59..f7f2c3d0c8 100644 --- a/data/reusables/user_settings/appearance-settings.md +++ b/data/reusables/user_settings/appearance-settings.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the left sidebar, click **{% octicon "paintbrush" aria-label="The paintbrush icon" %} Appearance**. {% else %} 1. In the user settings sidebar, click **Appearance**. diff --git a/data/reusables/user_settings/developer_settings.md b/data/reusables/user_settings/developer_settings.md index f8fc22316f..8b13c1d91d 100644 --- a/data/reusables/user_settings/developer_settings.md +++ b/data/reusables/user_settings/developer_settings.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the left sidebar, click **{% octicon "code" aria-label="The code icon" %} Developer settings**. {% else %} 1. In the left sidebar, click **Developer settings**. diff --git a/data/reusables/user_settings/emails.md b/data/reusables/user_settings/emails.md index dd47cf76a9..e19a8634fd 100644 --- a/data/reusables/user_settings/emails.md +++ b/data/reusables/user_settings/emails.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Access" section of the sidebar, click **{% octicon "mail" aria-label="The mail icon" %} Emails**. {% else %} 1. In the left sidebar, click **Emails**. diff --git a/data/reusables/user_settings/organizations.md b/data/reusables/user_settings/organizations.md index cf4c3cf6c5..519e8f0a96 100644 --- a/data/reusables/user_settings/organizations.md +++ b/data/reusables/user_settings/organizations.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Access" section of the sidebar, click **{% octicon "organization" aria-label="The organization icon" %} Organizations**. {% else %} 1. In your user settings sidebar, click **Organizations**. diff --git a/data/reusables/user_settings/repo-tab.md b/data/reusables/user_settings/repo-tab.md index be39213129..8a8cd80c04 100644 --- a/data/reusables/user_settings/repo-tab.md +++ b/data/reusables/user_settings/repo-tab.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Code planning, and automation" section of the sidebar, click **{% octicon "repo" aria-label="The repo icon" %} Repositories**. {% else %} 1. In the left sidebar, click **Repositories**. diff --git a/data/reusables/user_settings/saved_replies.md b/data/reusables/user_settings/saved_replies.md index 0d007727eb..51c59de438 100644 --- a/data/reusables/user_settings/saved_replies.md +++ b/data/reusables/user_settings/saved_replies.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Code, planning, and automation" section of the sidebar, click **{% octicon "reply" aria-label="The reply icon" %} Saved replies**. {% else %} 1. In the left sidebar, click **Saved replies**. diff --git a/data/reusables/user_settings/security-analysis.md b/data/reusables/user_settings/security-analysis.md index 0f79b730ae..d525a3d6ed 100644 --- a/data/reusables/user_settings/security-analysis.md +++ b/data/reusables/user_settings/security-analysis.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Security" section of the sidebar, click **{% octicon "shield-lock" aria-label="The shield-lock icon" %} Code security and analysis**. {% else %} 1. In the left sidebar, click **Security & analysis**. diff --git a/data/reusables/user_settings/security.md b/data/reusables/user_settings/security.md index 56cc87e20a..9e83e2c052 100644 --- a/data/reusables/user_settings/security.md +++ b/data/reusables/user_settings/security.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Access" section of the sidebar, click **{% octicon "shield-lock" aria-label="The shield-lock icon" %} Password and authentication**. {% else %} 1. In the left sidebar, click **Account security**. diff --git a/data/reusables/user_settings/ssh.md b/data/reusables/user_settings/ssh.md index 08e50ade35..b2c942ca79 100644 --- a/data/reusables/user_settings/ssh.md +++ b/data/reusables/user_settings/ssh.md @@ -1,4 +1,4 @@ -{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %} +{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %} 1. In the "Access" section of the sidebar, click **{% octicon "key" aria-label="The key icon" %} SSH and GPG keys**. {% else %} 1. In the user settings sidebar, click **SSH and GPG keys**.