Skip to content

Commit 6abb02d

Browse files
authored
Merge pull request github#36466 from github/repo-sync
Repo sync
2 parents 276dd36 + be8c9c6 commit 6abb02d

File tree

38 files changed

+1008
-1070
lines changed

38 files changed

+1008
-1070
lines changed

content/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/sharing-contributions-from-github-enterprise-server.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,8 @@ To share contributions from {% data variables.product.prodname_ghe_server %}, vi
4242
1. Sign in to both your user account on {% data variables.product.prodname_ghe_cloud %} **and** your user account on {% data variables.product.prodname_ghe_cloud %} ({% data variables.product.prodname_dotcom_the_website %}{% ifversion ghecom-github-connect %} or {% data variables.enterprise.data_residency_site %}{% endif %}).
4343
1. On {% data variables.product.prodname_ghe_server %}, in the upper-right corner of any page, click your profile photo, then click **Settings**.
4444

45-
{% ifversion global-nav-update %}
46-
4745
![Screenshot of a user's account menu on {% data variables.product.prodname_dotcom %}. The menu item "Settings" is outlined in dark orange.](/assets/images/help/settings/userbar-account-settings-global-nav-update.png)
4846

49-
{% else %}
50-
51-
![Screenshot of a user's account menu on {% data variables.product.prodname_dotcom %}. The menu item "Settings" is outlined in dark orange.](/assets/images/help/settings/userbar-account-settings.png)
52-
53-
{% endif %}
5447
{% data reusables.github-connect.github-connect-tab-user-settings %}
5548
{% data reusables.github-connect.connect-dotcom-and-enterprise %}
5649
1. Review the resources that {% data variables.product.prodname_ghe_server %} will access from your {% data variables.product.prodname_dotcom_the_website %}{% ifversion ghecom-github-connect %} or {% data variables.enterprise.data_residency_site %}{% endif %} account, then click **Authorize**.

content/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,10 @@ For more information about the `run` keyword, see [AUTOTITLE](/actions/using-wor
278278
For repositories with multiple compiled languages, you can specify language-specific build commands. For example, if your repository contains C/C++, C# and Java, you might want to provide manual build steps for one language (here Java). This specifies build steps for Java while still using `autobuild` for C/C++ and C#.
279279

280280
```yaml
281-
- if: matrix.language == {% ifversion codeql-language-identifiers-311 %}'c-cpp'{% else %}'cpp'{% endif %} || matrix.language == 'csharp'
281+
- if: matrix.language == 'c-cpp' || matrix.language == 'csharp'
282282
name: Autobuild
283283
uses: {% data reusables.actions.action-codeql-action-autobuild %}
284-
- if: matrix.language == {% ifversion codeql-language-identifiers-311 %}'java-kotlin'{% else %}'java'{% endif %}
284+
- if: matrix.language == 'java-kotlin'
285285
name: Build Java
286286
run: |
287287
make bootstrap

content/code-security/code-scanning/troubleshooting-code-scanning/some-languages-not-analyzed.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ If you're using advanced setup and your workflow doesn't explicitly specify the
2626
# ...
2727
strategy:
2828
fail-fast: false
29-
matrix: {% ifversion codeql-language-identifiers-311 %}
30-
language: ['csharp', 'c-cpp', 'javascript-typescript'] {% else %}
31-
language: ['csharp', 'cpp', 'javascript'] {% endif %}
29+
matrix:
30+
language: ['csharp', 'c-cpp', 'javascript-typescript']
3231

3332
steps:
3433
# ...

content/code-security/dependabot/working-with-dependabot/managing-pull-requests-for-dependency-updates.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ shortTitle: Manage Dependabot PRs
3030
When {% data variables.product.prodname_dependabot %} raises a pull request, you're notified by your chosen method for the repository. Each pull request contains detailed information about the proposed change, taken from the package manager. These pull requests follow the normal checks and tests defined in your repository.
3131
{% ifversion fpt or ghec %}In addition, where enough information is available, you'll see a compatibility score. This may also help you decide whether or not to merge the change. For information about this score, see [AUTOTITLE](/code-security/dependabot/dependabot-security-updates/about-dependabot-security-updates).{% endif %}
3232

33-
If you have many dependencies to manage, you may want to customize the configuration for each package manager so that pull requests have specific reviewers, assignees, and labels. {% ifversion dependabot-version-updates-groups %} You may also want to group sets of dependencies together, so that multiple dependencies are updated in a single pull request.{% endif %} For more information, see [AUTOTITLE](/code-security/dependabot/dependabot-version-updates/customizing-dependabot-prs){% ifversion dependabot-grouped-security-updates-config %} and [AUTOTITLE](/code-security/dependabot/dependabot-security-updates/configuring-dependabot-security-updates#grouping-dependabot-updates-into-a-single-pull-request).{% else %} and [AUTOTITLE](/code-security/dependabot/dependabot-security-updates/configuring-dependabot-security-updates#grouping-dependabot-security-updates-into-a-single-pull-request).{% endif %}
33+
If you have many dependencies to manage, you may want to customize the configuration for each package manager so that pull requests have specific reviewers, assignees, and labels. You may also want to group sets of dependencies together, so that multiple dependencies are updated in a single pull request. For more information, see [AUTOTITLE](/code-security/dependabot/dependabot-version-updates/customizing-dependabot-prs){% ifversion dependabot-grouped-security-updates-config %} and [AUTOTITLE](/code-security/dependabot/dependabot-security-updates/configuring-dependabot-security-updates#grouping-dependabot-updates-into-a-single-pull-request).{% else %} and [AUTOTITLE](/code-security/dependabot/dependabot-security-updates/configuring-dependabot-security-updates#grouping-dependabot-security-updates-into-a-single-pull-request).{% endif %}
3434

3535
> [!NOTE]
3636
> If you don't interact with {% data variables.product.prodname_dependabot %} pull requests for a repository during a 90-day time period, {% data variables.product.prodname_dependabot %} considers your repository as inactive, and will automatically pause {% data variables.product.prodname_dependabot_updates %}. For more information about inactivity criteria, see [AUTOTITLE](/code-security/dependabot/dependabot-version-updates/about-dependabot-version-updates#about-automatic-deactivation-of-dependabot-updates) and [AUTOTITLE](/code-security/dependabot/dependabot-security-updates/about-dependabot-security-updates#about-automatic-deactivation-of-dependabot-updates).
@@ -66,8 +66,8 @@ You can use any of the following commands on a {% data variables.product.prodnam
6666
* `@dependabot merge` merges the pull request once your CI tests have passed.
6767
* `@dependabot rebase` rebases the pull request.
6868
* `@dependabot recreate` recreates the pull request, overwriting any edits that have been made to the pull request.
69-
* `@dependabot reopen` reopens the pull request if the pull request is closed.{% ifversion dependabot-version-updates-groups %}
70-
* `@dependabot show DEPENDENCY_NAME ignore conditions` retrieves information on the ignore conditions for the specified dependency, and comments on the pull request with a table that displays all ignore conditions for the dependency. For example, `@dependabot show express ignore conditions` would find all `ignore` conditions stored for the Express dependency, and comment on the pull request with that information.{% endif %}
69+
* `@dependabot reopen` reopens the pull request if the pull request is closed.
70+
* `@dependabot show DEPENDENCY_NAME ignore conditions` retrieves information on the ignore conditions for the specified dependency, and comments on the pull request with a table that displays all ignore conditions for the dependency. For example, `@dependabot show express ignore conditions` would find all `ignore` conditions stored for the Express dependency, and comment on the pull request with that information.
7171
* `@dependabot squash and merge` squashes and merges the pull request once your CI tests have passed.
7272

7373
{% data variables.product.prodname_dependabot %} will react with a "thumbs up" emoji to acknowledge the command, and may respond with a comment on the pull request. While {% data variables.product.prodname_dependabot %} usually responds quickly, some commands may take several minutes to complete if {% data variables.product.prodname_dependabot %} is busy processing other updates or commands.

content/desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project-in-github-desktop.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,8 @@ shortTitle: Commit & review changes
1616

1717
{% data reusables.desktop.update-email-address %} For more information, see [AUTOTITLE](/desktop/configuring-and-customizing-github-desktop/configuring-git-for-github-desktop).
1818

19-
{% ifversion repo-rules %}
20-
2119
Repository administrators can enable rulesets for a branch to enforce specific conventions when committing. For example, a ruleset can require a commit to be signed, or for an issue number to be referenced at the start of a commit message. {% data variables.product.prodname_desktop %} will display a warning and prevent committing if a commit does not follow the rulesets. For more information, see [AUTOTITLE](/enterprise-cloud@latest/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets).
2220

23-
{% endif %}
24-
2521
## Choosing a branch and making changes
2622

2723
1. [Create a new branch](/desktop/making-changes-in-a-branch/managing-branches-in-github-desktop), or select an existing branch by clicking **{% octicon "git-branch" aria-hidden="true" %} Current Branch** on the toolbar and selecting the branch from the list.

content/desktop/making-changes-in-a-branch/managing-branches-in-github-desktop.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,8 @@ You can always create a branch in {% data variables.product.prodname_desktop %}
2727

2828
{% data reusables.desktop.protected-branches %}
2929

30-
{% ifversion repo-rules %}
31-
3230
Repository administrators can also enable rulesets. Rulesets can be used to require specific branch names when creating a new branch, or to allow only users with bypass permissions to publish a new branch to the remote repository. {% data variables.product.prodname_desktop %} will show a warning and prevent the branch from being created if the branch does not follow the rulesets. For more information, see [AUTOTITLE](/enterprise-cloud@latest/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets).
3331

34-
{% endif %}
35-
3632
## Creating a branch
3733

3834
> [!TIP]

content/desktop/making-changes-in-a-branch/pushing-changes-to-github-from-github-desktop.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,8 @@ Before pushing changes, you should update your local branch to include any commi
1919

2020
{% data reusables.desktop.protected-branches %}
2121

22-
{% ifversion repo-rules %}
23-
2422
Repository administrators can also enable rulesets for a branch, which will prevent a push from completing if a ruleset has not been followed. For example, a ruleset may require a specific branch naming convention, or an issue number at the start of a commit message. {% data variables.product.prodname_desktop %} will warn about rulesets to help prevent your branch from getting into a state where you would be unable to push your changes. For more information, see [AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets).
2523

26-
{% endif %}
27-
2824
## Pushing changes to {% data variables.product.prodname_dotcom %}
2925

3026
> [!NOTE]

content/get-started/using-github-docs/about-versions-of-github-docs.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,6 @@ You may use more than one {% data variables.product.company_short %} plan. For e
3333

3434
If you access {% data variables.product.prodname_dotcom %} at https://github.com, you're either using the features of a Free, Pro, or Team plan, or you're using {% data variables.product.prodname_ghe_cloud %}.
3535

36-
{% ifversion global-nav-update %}{% else %}
37-
In a wide browser window, there is no text that immediately follows the {% data variables.product.company_short %} logo on the left side of the header.
38-
39-
![Screenshot of the header of any page on {% data variables.product.prodname_dotcom %}. The {% data variables.product.prodname_dotcom %} logo is highlighted with an orange outline.](/assets/images/help/docs/header-dotcom.png)
40-
41-
{% endif %}
42-
4336
On {% data variables.product.prodname_dotcom_the_website %}, each account has its own plan. Each personal account has an associated plan that provides access to certain features, and each organization has a different associated plan. If your personal account is a member of an organization on {% data variables.product.prodname_dotcom %}, you may have access to different features when you use resources owned by that organization than when you use resources owned by your personal account. For more information, see [AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts).
4437

4538
If you don't know whether an organization uses {% data variables.product.prodname_ghe_cloud %}, ask an organization owner. For more information, see [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/viewing-peoples-roles-in-an-organization).

content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-board-layout.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,10 @@ In the board layout, you can choose which columns to display. The available colu
5050

5151
1. Select the columns you want to show.
5252

53-
{% ifversion projects-v2-slice-panel %}
54-
5553
## Slicing by field values
5654

5755
{% data reusables.projects.customize.slice-panel %}
5856

59-
{% endif %}
60-
6157
## Sorting by field values
6258

6359
You can sort items by a field value.
@@ -67,8 +63,6 @@ You can sort items by a field value.
6763
6864
{% data reusables.projects.customize.sort %}
6965

70-
{% ifversion projects-v2-swimlanes %}
71-
7266
## Grouping by field values
7367

7468
You can use a custom field value to group items and create horizontal sections on your board. These sections provide an additional way to organize and visually separate items. Additionally, horizontal grouping allows you to differentiate work according to work streams, team members, or varying levels of urgency or priority.
@@ -77,8 +71,6 @@ You can use a custom field value to group items and create horizontal sections o
7771

7872
{% data reusables.projects.customize.group-fields %}
7973

80-
{% endif %}
81-
8274
## Showing the sum of a number field
8375

8476
{% data reusables.projects.customize.sum %}

content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/customizing-the-table-layout.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,10 @@ You can group items by a custom field value. {% data reusables.projects.customiz
3333

3434
{% data reusables.projects.customize.group-fields %}
3535

36-
{% ifversion projects-v2-slice-panel %}
37-
3836
## Slicing by field values
3937

4038
{% data reusables.projects.customize.slice-panel %}
4139

42-
{% endif %}
43-
4440
## Reordering fields
4541

4642
You can change the order of fields.

0 commit comments

Comments
 (0)