diff --git a/assets/images/help/profile/user-profile-followers.png b/assets/images/help/profile/user-profile-followers.png new file mode 100644 index 0000000000..680f86414f Binary files /dev/null and b/assets/images/help/profile/user-profile-followers.png differ diff --git a/assets/images/help/profile/user-profile-following.png b/assets/images/help/profile/user-profile-following.png new file mode 100644 index 0000000000..d04779f5b4 Binary files /dev/null and b/assets/images/help/profile/user-profile-following.png differ diff --git a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/what-does-the-available-for-hire-checkbox-do.md b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/what-does-the-available-for-hire-checkbox-do.md index 557fe61263..6d002bd75b 100644 --- a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/what-does-the-available-for-hire-checkbox-do.md +++ b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/what-does-the-available-for-hire-checkbox-do.md @@ -14,7 +14,7 @@ shortTitle: Available for hire checkbox {% warning %} -Deprecation note: GitHub Jobs is now deprecated. The last date to post a job was May 19, 2021. The GitHub Jobs site will shut down entirely on August 19, 2021. For more information, see the [GitHub blog post](https://github.blog/changelog/2021-04-19-deprecation-notice-github-jobs-site/). +Deprecation note: GitHub Jobs is now deprecated. The last date to post a job was May 19, 2021. The GitHub Jobs site has shut down entirely on August 19, 2021, and now redirects to the [GitHub blog post](https://github.blog/changelog/2021-04-19-deprecation-notice-github-jobs-site/) notice, which has more information on the now-completed deprecation of GitHub Jobs. {% endwarning %} diff --git a/content/actions/guides/building-and-testing-python.md b/content/actions/guides/building-and-testing-python.md index 5b6e87d4f3..57a627a6f5 100644 --- a/content/actions/guides/building-and-testing-python.md +++ b/content/actions/guides/building-and-testing-python.md @@ -350,9 +350,9 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python }} - - name: Install Tox and any other packages + - name: Install tox and any other packages run: pip install tox - - name: Run Tox + - name: Run tox # Run tox using the version of Python in `PATH` run: tox -e py ``` diff --git a/content/actions/guides/publishing-java-packages-with-gradle.md b/content/actions/guides/publishing-java-packages-with-gradle.md index b263c744d3..9d87260a9f 100644 --- a/content/actions/guides/publishing-java-packages-with-gradle.md +++ b/content/actions/guides/publishing-java-packages-with-gradle.md @@ -74,9 +74,7 @@ publishing { ``` {% endraw %} -With this configuration, you can create a workflow that publishes your package to the Maven Central Repository by running the `gradle publish` command. You’ll also need to provide environment variables that contain the username and password to authenticate to the repository. - -In the deploy step, you’ll need to set environment variables for the username and password or token that you use to authenticate to the Maven repository. For more information, see "[Creating and using encrypted secrets](/github/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)." +With this configuration, you can create a workflow that publishes your package to the Maven Central Repository by running the `gradle publish` command. In the deploy step, you’ll need to set environment variables for the username and password or token that you use to authenticate to the Maven repository. For more information, see "[Creating and using encrypted secrets](/github/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets)." ```yaml{:copy} {% data reusables.actions.actions-not-certified-by-github-comment %} @@ -143,7 +141,7 @@ publishing { ``` {% endraw %} -With this configuration, you can create a workflow that publishes your package to the Maven Central Repository by running the `gradle publish` command. +With this configuration, you can create a workflow that publishes your package to {% data variables.product.prodname_registry %} by running the `gradle publish` command. ```yaml{:copy} {% data reusables.actions.actions-not-certified-by-github-comment %} @@ -185,7 +183,7 @@ Ensure your _build.gradle_ file includes a repository for both your {% data vari For example, if you deploy to the Central Repository through the OSSRH hosting project, you might want to specify it in a distribution management repository with the `name` set to `OSSRH`. If you deploy to {% data variables.product.prodname_registry %}, you might want to specify it in a distribution management repository with the `name` set to `GitHubPackages`. -If your organization is named "octocat" and your repository is named "hello-world", then the {% data variables.product.prodname_registry %} configuration in _build.gradle_ would look similar to the below example. +If your organization is named "octocat" and your repository is named "hello-world", then the configuration in _build.gradle_ would look similar to the below example. {% raw %} ```groovy{:copy} @@ -243,7 +241,7 @@ jobs: distribution: 'adopt' - name: Validate Gradle wrapper uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b - - name: Publish to the Maven Central Repository + - name: Publish package run: gradle publish env: {% raw %} MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} diff --git a/content/actions/reference/workflow-syntax-for-github-actions.md b/content/actions/reference/workflow-syntax-for-github-actions.md index f5059a73fb..426e94f7f7 100644 --- a/content/actions/reference/workflow-syntax-for-github-actions.md +++ b/content/actions/reference/workflow-syntax-for-github-actions.md @@ -40,7 +40,7 @@ Selects the types of activity that will trigger a workflow run. Most GitHub even You can use an array of event `types`. For more information about each event and their activity types, see "[Events that trigger workflows](/articles/events-that-trigger-workflows#webhook-events)." ```yaml -# Trigger the workflow on pull request activity +# Trigger the workflow on release activity on: release: # Only use the types keyword to narrow down the activity types that will trigger your workflow. diff --git a/content/get-started/exploring-projects-on-github/following-people.md b/content/get-started/exploring-projects-on-github/following-people.md index f9d57af7da..4182152213 100644 --- a/content/get-started/exploring-projects-on-github/following-people.md +++ b/content/get-started/exploring-projects-on-github/following-people.md @@ -22,8 +22,8 @@ You can unfollow someone if you do not wish to see their public activity on {% d ## Following a user on {% data variables.product.product_name %} 1. Click a user image to display that user's profile. - - ![User image](/assets/images/help/profile/user-profile-image.png) + + ![User image](/assets/images/help/profile/user-profile-image.png) 2. Click **Follow** under their profile image. @@ -33,12 +33,31 @@ You can unfollow someone if you do not wish to see their public activity on {% d 1. Click a user image to display that user's profile. - ![User image](/assets/images/help/profile/user-profile-image.png) + ![User image](/assets/images/help/profile/user-profile-image.png) 2. Click **Unfollow** under their profile image. - ![User profile button](/assets/images/help/profile/user-profile-unfollow-button.png) + ![User profile button](/assets/images/help/profile/user-profile-unfollow-button.png) +## Viewing followed users on {% data variables.product.product_name %} + +1. Click a user image to display that user's profile. + + ![User image](/assets/images/help/profile/user-profile-image.png) + +2. Click **following** under their profile image. + + ![User following](/assets/images/help/profile/user-profile-following.png) + +## Viewing followers on {% data variables.product.product_name %} + +1. Click a user image to display that user's profile. + + ![User image](/assets/images/help/profile/user-profile-image.png) + +2. Click **followers** under their profile image. + + ![User following](/assets/images/help/profile/user-profile-followers.png) diff --git a/content/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization.md b/content/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization.md index 77a9b308c2..46cc0b94ee 100644 --- a/content/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization.md @@ -76,6 +76,7 @@ Some of the features listed below are limited to organizations using {% data var | Apply milestones | | **X** | **X** | **X** | **X** | | Mark [duplicate issues and pull requests](/articles/about-duplicate-issues-and-pull-requests)| | **X** | **X** | **X** | **X** | | Request [pull request reviews](/articles/requesting-a-pull-request-review) | | **X** | **X** | **X** | **X** | +| Merge a [pull request](/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges) | | | **X** | **X** | **X** | | Push to (write) the person or team's assigned repositories | | | **X** | **X** | **X** | | Edit and delete anyone's comments on commits, pull requests, and issues | | | **X** | **X** | **X** | | [Hide anyone's comments](/communities/moderating-comments-and-conversations/managing-disruptive-comments) | | | **X** | **X** | **X** | diff --git a/data/glossaries/internal.yml b/data/glossaries/internal.yml index 039d0e75b2..750a32af3a 100644 --- a/data/glossaries/internal.yml +++ b/data/glossaries/internal.yml @@ -214,7 +214,7 @@ description: An agreement users sign when using GitHub Marketplace. - term: GPG description: >- - GNU Privacy Guard. Encyrption software that you can use to encrypt (and + GNU Privacy Guard. Encryption software that you can use to encrypt (and decrypt) files that contain sensitive data - term: GPG key description: An encryption key used with GPG. diff --git a/data/release-notes/enterprise-server/3-0/0-rc1.yml b/data/release-notes/enterprise-server/3-0/0-rc1.yml index eff12aeed9..60882dadd1 100644 --- a/data/release-notes/enterprise-server/3-0/0-rc1.yml +++ b/data/release-notes/enterprise-server/3-0/0-rc1.yml @@ -18,7 +18,7 @@ sections: - Backup-utils can trigger unnecessary emails to administrators - Incorrect Packages settings are being displayed in the Organization member view page - After removing oneself as an Enterprise Owner, you are redirected to a 404 page. The operation is successful. - - '`ghe-config-apply` occassionally fails with `ERROR: Failure waiting for nomad jobs to apply` until the Nomad job queue is cleared. This currently requires as admin to delete `/etc/nomad-jobs/queue`.' + - '`ghe-config-apply` occasionally fails with `ERROR: Failure waiting for nomad jobs to apply` until the Nomad job queue is cleared. This currently requires as admin to delete `/etc/nomad-jobs/queue`.' - When configuring a multiple replica node, the status of the replica can be incorrectly synchronized. - Customers attempting to restore a 3.0 backup to a new instance should not pre-configure the instance, as it may lead to a bad state for user logins. We recommend restoring to a fresh, unconfigured instance. - GitHub Enterprise Server 3.0 release candidates are not yet available in the Azure marketplace. To test release candidates in staging environments, start a 2.21 or 2.22 instance, and then upgrade it with the Azure upgrade package on the download page. diff --git a/data/release-notes/enterprise-server/3-0/0.yml b/data/release-notes/enterprise-server/3-0/0.yml index d98405c126..65c716ce15 100644 --- a/data/release-notes/enterprise-server/3-0/0.yml +++ b/data/release-notes/enterprise-server/3-0/0.yml @@ -62,7 +62,7 @@ sections: - The webhook events delivery system has been rearchitected for higher throughput, faster deliveries, and fewer delayed messages. It also uses less CPU and memory in {% data variables.product.prodname_ghe_server %} 3.0+. - Organization and Enterprise owners can now see when a team member has been promoted to or demoted from being a team maintainer in the audit log through the new `team.promote_maintainer` and `team.demote_maintainer` audit log events. For more information, see "[Audited actions](/enterprise-server@3.0/admin/user-management/audited-actions)." - Repository maintainers with existing {% data variables.product.prodname_pages %} sites can [easily update their prior default branch name](/enterprise-server@3.0/github/working-with-github-pages/about-github-pages#publishing-sources-for-github-pages-sites). - - Additional hardware resources are required to run {% data variables.product.prodname_ghe_server %} with any of Actions, Packages or Advanced Security enabled. For more infomation on the minimum required resources for each supported platform, see "[Setting up a {% data variables.product.prodname_ghe_server %} instance](/enterprise-server@3.0/admin/installation/setting-up-a-github-enterprise-server-instance)." + - Additional hardware resources are required to run {% data variables.product.prodname_ghe_server %} with any of Actions, Packages or Advanced Security enabled. For more information on the minimum required resources for each supported platform, see "[Setting up a {% data variables.product.prodname_ghe_server %} instance](/enterprise-server@3.0/admin/installation/setting-up-a-github-enterprise-server-instance)." - Administrators can now [publish a message](/enterprise-server@3.0/admin/user-management/customizing-user-messages-for-your-enterprise), which all users must accept. This can help to onboard new users and surface other organization-specific information and policies. - heading: Security Changes