Skip to content

Commit 1a17cb3

Browse files
lucascostilucascosti
authored
Merge branch 'main' into ahdbilal-gitlab-migration-guide
2 parents 851d90d + 9b1b02a commit 1a17cb3

File tree

83 files changed

+1986
-1722
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+1986
-1722
lines changed

‎.all-contributorsrc

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,43 @@
285285
"bug",
286286
"code"
287287
]
288+
},
289+
{
290+
"login": "BenJam",
291+
"name": "Benjamin Nickolls",
292+
"avatar_url": "https://avatars2.githubusercontent.com/u/158833?v=4",
293+
"profile": "https://github.com/BenJam",
294+
"contributions": [
295+
"doc"
296+
]
297+
},
298+
{
299+
"login": "jeffmcaffer",
300+
"name": "Jeff McAffer",
301+
"avatar_url": "https://avatars2.githubusercontent.com/u/10070956?v=4",
302+
"profile": "https://mcaffer.com",
303+
"contributions": [
304+
"doc"
305+
]
306+
},
307+
{
308+
"login": "tjenkinson",
309+
"name": "Tom Jenkinson",
310+
"avatar_url": "https://avatars0.githubusercontent.com/u/3259993?v=4",
311+
"profile": "https://tjenkinson.me",
312+
"contributions": [
313+
"code"
314+
]
315+
},
316+
{
317+
"login": "casals",
318+
"name": "Arthur Casals",
319+
"avatar_url": "https://avatars0.githubusercontent.com/u/785860?v=4",
320+
"profile": "https://github.com/casals",
321+
"contributions": [
322+
"content",
323+
"doc"
324+
]
288325
}
289326
],
290327
"contributorsPerLine": 7,
@@ -294,4 +331,4 @@
294331
"repoHost": "https://github.com",
295332
"skipCi": true,
296333
"commitConvention": "none"
297-
}
334+
}

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: GitHub Support
4+
url: https://support.github.com/contact
5+
about: Contact Support if you're having trouble with your GitHub account.

‎.github/ISSUE_TEMPLATE/engineering-issue.md

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/enterprise-release.md

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/improve-existing-docs.md

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,33 @@
11
---
2-
name: Docs content issues have moved!
3-
about: Create an issue about existing content (not upcoming releases/ships), whether reported by users or noticed by Hubbers.
2+
name: Improve existing docs
3+
about: Make a suggestion to improve our existing documentation.
44
title: ''
55
labels:
6-
- Improve existing docs
6+
- content
77
assignees: ''
88
---
9-
# Docs content issues have moved!
9+
<!--
10+
HUBBERS BEWARE! THE GITHUB/DOCS REPO IS PUBLIC TO THE ENTIRE INTERNET. OPEN AN ISSUE IN GITHUB/DOCS-CONTENT https://github.com/github/docs-content/issues/new/choose INSTEAD.
11+
-->
1012

11-
When we open source this repository in October :tada: all of our issue templates will be visible to the public. From now on, you can open new docs issues for docs.github.com in our internal [docs-content repo](https://github.com/github/docs-content) :dizzy:
13+
<!--
14+
For questions, ask in Discussions: https://github.com/github/docs/discussions
1215
13-
# :boom::point_right:[new issue templates](https://github.com/github/docs-content/issues/new/choose):point_left::boom:
16+
Before you file an issue read the:
17+
- Code of Conduct: https://github.com/github/docs/blob/onboarding/CODE_OF_CONDUCT.md
18+
- Contributing guide: https://github.com/github/docs/blob/onboarding/CONTRIBUTING.md
19+
20+
Check to make sure someone hasn't already opened a similar issue: https://github.com/github/docs/issues
21+
-->
22+
23+
### What article on docs.github.com is affected?
24+
25+
<!-- Please link to the article you'd like to see updated -->
26+
27+
### What part(s) of the article would you like to see updated?
28+
29+
<!-- Give as much detail as you can to help us understand the change you want to see. Why should the docs be changed? What use cases does it support? What is the expected outcome? -->
30+
31+
### Additional information
32+
33+
<!-- Add any other context or screenshots about the feature request here. -->

‎.github/ISSUE_TEMPLATE/improve-the-site.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
name: Improve the docs.github.com site
3+
about: Make a suggestions or report a problem on the docs.github.com website.
4+
title: ''
5+
labels: engineering
6+
assignees: ''
7+
---
8+
9+
<!--
10+
HUBBERS BEWARE! THE GITHUB/DOCS REPO IS PUBLIC TO THE ENTIRE INTERNET. OPEN AN ISSUE IN GITHUB/DOCS-CONTENT https://github.com/github/docs-content/issues/new/choose INSTEAD.
11+
-->
12+
13+
<!--
14+
For questions, ask in Discussions: https://github.com/github/docs/discussions
15+
16+
Before you file an issue read the:
17+
- Code of Conduct: https://github.com/github/docs/blob/onboarding/CODE_OF_CONDUCT.md
18+
- Contributing guide: https://github.com/github/docs/blob/onboarding/CONTRIBUTING.md
19+
20+
Check to make sure someone hasn't already opened a similar issue: https://github.com/github/docs/issues
21+
-->
22+
23+
### What is the current behavior?
24+
25+
<!-- include links to articles where you're seeing a problem, screenshots, what browser you're using, etc. -->
26+
27+
### What changes are you suggesting?
28+
29+
<!-- Give as much detail as you can to help us understand the change you want to see. Why should the docs be changed? What use cases does it support? What is the expected outcome? -->
30+
31+
### Additional information
32+
33+
<!-- Any additional information, configuration, or data that might be necessary to reproduce the issue. -->

‎.github/ISSUE_TEMPLATE/issue-party.md

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,29 @@
1+
<!--
2+
HUBBERS BEWARE! THE GITHUB/DOCS REPO IS PUBLIC TO THE ENTIRE INTERNET. OPEN AN ISSUE IN GITHUB/DOCS-CONTENT https://github.com/github/docs-content/issues/new/choose INSTEAD.
3+
-->
4+
15
<!--
26
Hello! Thanks for your interest in contributing to this project.
37
4-
Before opening a PR, please see our [CONTRIBUTING.md](https://github.com/github/docs-internal/blob/main/CONTRIBUTING.md) for information about how we discuss and track changes.
8+
Before opening a PR, please see our [CONTRIBUTING.md](https://github.com/github/docs/blob/main/CONTRIBUTING.md) for information how to contribute.
9+
10+
For changes to content in [site policy](https://github.com/github/docs/tree/main/content/github/site-policy), see the [CONTRIBUTING guide in the site-policy repo](https://github.com/github/site-policy/blob/main/CONTRIBUTING.md).
11+
12+
Thanks again! :octocat:
13+
-->
14+
15+
### Why:
516

6-
Please link to a corresponding issue when you open a PR:
17+
<!--
718
- If there's an existing issue for your change, please link to it.
8-
- If there's _not_ an existing issue, please open one first according to the contributing guidelines: https://github.com/github/docs-internal/issues/new/choose.
19+
- If there's _not_ an existing issue, please open one first to make it more likely that this update will be accepted: https://github.com/github/docs/issues/new/choose. -->
920

10-
For code/platform related requests, please open a Docs Engineering support request using [this template](https://github.com/github/docs-internal/issues/new?assignees=&labels=engineering&template=engineering-issue.md&title=).
21+
### What's being changed:
1122

12-
For changes to content in [site policy](https://github.com/github/docs-internal/tree/main/content/github/site-policy), please use the [site policy PR template](https://github.com/github/site-policy-internal/blob/master/site-policy-PR-template.md) in this PR and make sure to include the ping to `@github/site-policy-admins`.
23+
<!-- Share artifacts of the changes, be they code snippets, GIFs or screenshots; whatever shares the most context. -->
1324

14-
Thanks again! :octocat:
15-
-->
25+
### Check off the following:
26+
- [ ] All of the tests are passing.
27+
- [ ] I have reviewed my changes in staging.
28+
- [ ] For content changes, I have reviewed the [localization checklist](https://github.com/github/docs/blob/main/contributing/localization-checklist.md)
29+
- [ ] For content changes, I have reviewed the [Content style guide for GitHub Docs](https://github.com/github/docs/blob/main/contributing/content-style-guide.md).

‎.github/allowed-actions.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ module.exports = [
88
'actions/cache@v2',
99
'actions/checkout@v2',
1010
'actions/github-script@0.9.0',
11+
'actions/github-script@v2.0.0',
1112
'actions/github-script@v2',
1213
'actions/github-script@v3',
1314
'actions/labeler@v2',
@@ -25,8 +26,11 @@ module.exports = [
2526
'pascalgn/automerge-action@135f0bdb927d9807b5446f7ca9ecc2c51de03c4a',
2627
'peter-evans/create-issue-from-file@v2',
2728
'peter-evans/create-pull-request@v2',
29+
'rachmari/actions-add-new-issue-to-column@v1.1.1',
30+
'rachmari/labeler@v1.0.4',
2831
'repo-sync/github-sync@v2',
2932
'repo-sync/pull-request@v2',
3033
'rtCamp/action-slack-notify@master',
31-
'rtCamp/action-slack-notify@v2.1.0'
32-
]
34+
'rtCamp/action-slack-notify@v2.1.0',
35+
'tjenkinson/gh-action-auto-merge-dependency-updates@cee2ac0'
36+
]

‎.github/workflows/automerge-dependencies.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Auto Merge Dependency Updates
2+
3+
on:
4+
- pull_request
5+
- pull_request_review
6+
7+
jobs:
8+
run:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: tjenkinson/gh-action-auto-merge-dependency-updates@cee2ac0
12+
with:
13+
repo-token: ${{ secrets.GITHUB_TOKEN }}
14+
allowed-actors: dependabot[bot]

0 commit comments

Comments
 (0)