Skip to content

Commit 55a4386

Browse files
authored
Merge pull request #26024 from github/repo-sync
Repo sync
2 parents 01eca67 + 6e33e46 commit 55a4386

12 files changed

Lines changed: 63 additions & 33 deletions

File tree

.github/workflows/repo-sync.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -126,30 +126,6 @@ jobs:
126126
}
127127
console.log('No detected merge conflicts')
128128
129-
// Temporary, what does this prevent?
130-
// console.log('Checking mergeable')
131-
// if (pull.mergeable) {
132-
// console.log('Pull request is mergeable')
133-
// } else {
134-
// console.log('Pull request is not mergeable, closing')
135-
// await closePullRequest(pull_number)
136-
// return
137-
// }
138-
139-
console.log('Approving pull request')
140-
try {
141-
await github.rest.pulls.createReview({
142-
owner,
143-
repo,
144-
pull_number,
145-
event: 'APPROVE',
146-
})
147-
console.log('Approved pull request')
148-
} catch (error) {
149-
console.error('Failed to approve the pull request.', error)
150-
// Don't fail the workflow
151-
}
152-
153129
console.log('Merging the pull request')
154130
// Admin merge pull request to avoid squash
155131
await github.rest.pulls.merge({
4.17 KB
Loading
7.08 KB
Loading
9.13 KB
Loading

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/about-your-personal-dashboard.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ topics:
1717
- Accounts
1818
shortTitle: Your personal dashboard
1919
---
20+
21+
{% ifversion global-nav-update %}
22+
{% data reusables.navigation.global-nav-beta-note %}
23+
{% endif %}
24+
2025
## Accessing your personal dashboard
2126

2227
Your personal dashboard is the first page you'll see when you sign in on {% data variables.product.product_name %}.
@@ -31,7 +36,14 @@ In the "Recent activity" section of your news feed, you can quickly find and fol
3136

3237
## Finding your top repositories and teams
3338

39+
{% ifversion global-nav-update %}
40+
In the global navigation menu, you can access the top repositories and teams you use. To open the menu, select {% octicon "three-bars" aria-label="Open global navigation menu" %} at the top left of any page.
41+
42+
![Screenshot of the navigation bar on {% data variables.product.product_name %}. The "Open global navigation menu" icon is outlined in dark orange.](/assets/images/help/navigation/global-navigation-menu-icon.png)
43+
44+
{% else %}
3445
In the left sidebar of your dashboard, you can access the top repositories and teams you use.
46+
{% endif %}
3547

3648
The list of top repositories is automatically generated, and can include any repository you have interacted with, whether it's owned directly by your account or not. Interactions include making commits and opening or commenting on issues and pull requests. The list of top repositories cannot be edited, but repositories will drop off the list {% ifversion ghes < 3.6 or ghae < 3.6 %}4 months{% else %}1 year{% endif %} after you last interacted with them.
3749

content/discussions/guides/finding-your-discussions.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,22 @@ redirect_from:
88
- /discussions/guides/finding-discussions-across-multiple-repositories
99
---
1010

11+
{% ifversion global-nav-update %}
12+
{% data reusables.navigation.global-nav-beta-note %}
13+
{% endif %}
1114

1215
## Finding discussions
16+
{% ifversion global-nav-update %}
17+
1. In the top-left corner of {% data variables.location.product_location %}, select {% octicon "three-bars" aria-label="Open global navigation menu" %}, then click {% octicon "comment-discussion" aria-hidden="true" %} **Discussions**.
1318

19+
![Screenshot of the navigation bar on {% data variables.product.product_name %}. The "Open global navigation menu" icon is outlined in dark orange.](/assets/images/help/navigation/global-navigation-menu-icon.png)
20+
21+
{% else %}
1422
1. In the top-right corner of {% data variables.location.product_location %}, click your profile photo, then click **Your discussions**.
1523

1624
![Screenshot of the account dropdown on {% data variables.product.product_name %}. The "Your discussions" option is outlined in dark orange.](/assets/images/help/discussions/your-discussions.png)
1725

26+
{% endif %}
1827
1. Toggle between **Created** and **Commented** to see the discussions you've created or participated in.
1928

2029
## Further reading

content/issues/tracking-your-work-with-issues/viewing-all-of-your-issues-and-pull-requests.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,25 @@ topics:
1717
shortTitle: View all your issues & PRs
1818
type: how_to
1919
---
20-
Your issues and pull request dashboards are available at the top of any page. On each dashboard, you can filter the list to find issues or pull requests you created, that are assigned to you, or in which you're mentioned. You can also find pull requests that you've been asked to review.
2120

21+
{% ifversion global-nav-update %}
22+
{% data reusables.navigation.global-nav-beta-note %}
23+
{% endif %}
24+
25+
Your issue and pull request dashboards are available at the top of any page. On each dashboard, you can filter the list to find issues or pull requests you created, that are assigned to you, or in which you're mentioned. You can also find pull requests that you've been asked to review.
26+
27+
{% ifversion global-nav-update %}
28+
1. At the top of any page, click {% octicon "issue-opened" aria-label="Issues" %} to see your issues or {% octicon "git-pull-request" aria-label="Pull requests" %} to see your pull requests.
29+
30+
![Screenshot of the header of any page on {% data variables.product.product_name %}. The "Pull requests" and "Issues" icons are outlined in dark orange.](/assets/images/help/navigation/issues-and-prs-new-navigation.png)
31+
32+
{% else %}
2233
1. At the top of any page, click **Pull requests** or **Issues**.
2334

24-
![Screenshot of the header of any page on {% data variables.product.prodname_dotcom %}. The "Pull requests" and "Issues" tabs are highlighted with an orange outline.](/assets/images/help/overview/issues_and_pr_dashboard.png)
25-
2. Optionally, choose a filter or [use the search bar to filter for more specific results](/issues/tracking-your-work-with-issues/filtering-and-searching-issues-and-pull-requests).
35+
![Screenshot of the header of any page on {% data variables.product.prodname_dotcom %}. The "Pull requests" and "Issues" tabs are highlighted with an orange outline.](/assets/images/help/navigation/issues_and_pr_dashboard.png)
36+
37+
{% endif %}
38+
1. Optionally, choose a filter or use the search bar to filter for more specific results. For more information, see "[AUTOTITLE](/issues/tracking-your-work-with-issues/filtering-and-searching-issues-and-pull-requests)."
2639

2740
## Further reading
2841

content/search-github/searching-on-github/searching-github-marketplace.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ redirect_from:
1111
- /github/searching-for-information-on-github/searching-on-github/searching-github-marketplace
1212
shortTitle: Search GitHub Marketplace
1313
---
14+
15+
{% data reusables.navigation.global-nav-beta-note %}
16+
1417
## About searching {% data variables.product.prodname_marketplace %}
1518

1619
You can find apps and actions on {% data variables.product.prodname_marketplace %} in two ways:
@@ -19,19 +22,19 @@ You can find apps and actions on {% data variables.product.prodname_marketplace
1922
- Search across all of {% data variables.product.prodname_dotcom_the_website %} and then filter the results.
2023

2124
## Searching in {% data variables.product.prodname_marketplace %}
25+
1. To open {% data variables.product.prodname_marketplace %}, in the top-left corner of {% data variables.location.product_location %}, select {% octicon "three-bars" aria-label="Open global navigation menu" %}, then click {% octicon "gift" aria-hidden="true" %} **Marketplace**.
2226

23-
1. At the top of any page, click **Marketplace**.
24-
![Screenshot of the top level menu of {% data variables.product.prodname_dotcom_the_website %}. The "Marketplace" link is outlined in dark orange.](/assets/images/help/search/marketplace-link.png)
25-
2. Type any keywords and press **Enter**.
26-
3. Optionally, filter your results by clicking one or more options in the left sidebar.
27+
![Screenshot of the navigation bar on {% data variables.product.product_name %}. The "Open global navigation menu" icon is outlined in dark orange.](/assets/images/help/navigation/global-navigation-menu-icon.png)
28+
1. Type any keywords and press **Enter**.
29+
1. Optionally, filter your results by clicking one or more options in the left sidebar.
2730

2831
## Searching across {% data variables.product.prodname_dotcom_the_website %}
2932

3033
Anytime you search across all of {% data variables.product.prodname_dotcom_the_website %}, you can filter the results to see matching apps and actions from {% data variables.product.prodname_marketplace %}.
3134

3235
1. Navigate to https://github.com/search.
33-
2. Type any keywords and press **Enter**.
34-
3. In the left sidebar, click **Marketplace**.
36+
1. Type any keywords and press **Enter**.
37+
1. In the left sidebar, click **Marketplace**.
3538
![Screenshot of the search results for 'linter'. The "Marketplace" option in the left-side menu is outlined in dark orange.](/assets/images/help/search/marketplace-left-side-navigation.png)
3639

3740
## Further reading
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Reference: #10533.
2+
# Documentation for the global navigation opt-out public beta
3+
4+
versions:
5+
fpt: '*'
6+
ghec: '*'
7+
ghes: '>3.10'
8+
ghae: '>3.10'
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{% note %}
2+
3+
This article refers to the new global navigation, which is currently in public beta and subject to change. For more information on the new global navigation and reverting to the old global navigation, see the [{% data variables.product.prodname_dotcom %} Changelog](https://github.blog/changelog/2023-06-15-redesigned-navigation-enabled-for-all-users-beta/).
4+
5+
{% endnote %}

0 commit comments

Comments
 (0)