Skip to content

[pull] main from github:main #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 30 commits into from
Apr 22, 2021
Merged

[pull] main from github:main #44

Changes from 3 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
904a4e5
Document GitHub serverside limit on URL length
gukoff Mar 15, 2021
e8cbb6c
Correct 2**13 to 2**13 - 1
gukoff Mar 15, 2021
fdbbe51
Wikis aren't crawled. Suggest GH Pages alternative
nelsonjchen Apr 4, 2021
b60122a
Mention that hotpatching RCs is unsupported (#18904)
mattpollard Apr 22, 2021
2b5de5b
Branch was updated using the 'autoupdate branch' Actions workflow.
Octomerger Apr 22, 2021
15e6d75
Merge pull request #18926 from github/repo-sync
Octomerger Apr 22, 2021
27d9850
Hack some versioning for product callout (#18884)
mattpollard Apr 22, 2021
900d6ec
Merge pull request #5626 from github/repo-sync
Octomerger Apr 22, 2021
0e8cc97
Merge branch 'main' into repo-sync
Octomerger Apr 22, 2021
633ef5b
Merge branch 'main' into repo-sync
Octomerger Apr 22, 2021
039d692
Merge pull request #18933 from github/repo-sync
Octomerger Apr 22, 2021
d5ba691
Merge pull request #5627 from github/repo-sync
Octomerger Apr 22, 2021
c6347b7
actions-scheduled-workflow-example: fix cron spec (#5572)
philpennock Apr 22, 2021
51144be
Merge branch 'main' into repo-sync
Octomerger Apr 22, 2021
1361bb3
Merge pull request #18936 from github/repo-sync
Octomerger Apr 22, 2021
3383ea7
Add new step to migrate internal repos for 3.0+ (#18927)
bwestover Apr 22, 2021
c0b5521
Merge pull request #5631 from github/repo-sync
Octomerger Apr 22, 2021
f7da6e0
Update content/communities/documenting-your-project-with-wikis/about-…
janiceilene Apr 22, 2021
d7c4dd2
Merge branch 'main' into non-crawl-wiki-pages
janiceilene Apr 22, 2021
b1da73c
Merge pull request #5054 from nelsonjchen/non-crawl-wiki-pages
janiceilene Apr 22, 2021
76a04a6
Update content/github/managing-your-work-on-github/about-automation-f…
lee-dohm Apr 22, 2021
49899f8
Merge branch 'main' into patch-1
lee-dohm Apr 22, 2021
13a49b7
Merge pull request #18939 from github/repo-sync
Octomerger Apr 22, 2021
d629ca0
Remove unused custom styling (#18912)
heiskr Apr 22, 2021
7087d25
Add rate limit note; suggest caching/etags (#5614)
jamisonhyatt Apr 22, 2021
a2e5a91
Merge branch 'main' into patch-1
janiceilene Apr 22, 2021
3be3528
Update PULL_REQUEST_TEMPLATE.md (#18708)
chiedo Apr 22, 2021
9d6cf34
Merge pull request #4537 from gukoff/patch-1
janiceilene Apr 22, 2021
72e04ec
Merge branch 'main' into repo-sync
Octomerger Apr 22, 2021
cab239f
Merge pull request #5634 from github/repo-sync
Octomerger Apr 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/reusables/gated-features/auto-merge.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{% if currentVersion == "github-ae@latest" %}Auto-merge for pull requests is available in internal and private repositories with {% data variables.product.prodname_ghe_managed %}, {% else %}Auto-merge for pull requests is available {% endif %} in public repositories with {% data variables.product.prodname_free_user %} and {% data variables.product.prodname_free_team %} for organizations, and in public and private repositories with {% data variables.product.prodname_pro %}, {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %}, and {% data variables.product.prodname_ghe_server %}. {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %}
{% if currentVersion == "github-ae@latest" %}Auto-merge for pull requests is available in internal and private repositories with {% data variables.product.prodname_ghe_managed %}, {% else %}Auto-merge for pull requests is available {% endif %} in public repositories with {% data variables.product.prodname_free_user %} and {% data variables.product.prodname_free_team %} for organizations, and in public and private repositories with {% data variables.product.prodname_pro %}, {% data variables.product.prodname_team %}, {% if enterpriseServerVersions contains "[email protected]" %}{% data variables.product.prodname_ghe_cloud %}, and {% data variables.product.prodname_ghe_server %}{% else %}and {% data variables.product.prodname_ghe_cloud %}{% endif %}. {% if currentVersion == "free-pro-team@latest" %}{% data reusables.gated-features.more-info %}{% endif %}