Skip to content

Commit

Permalink
Merge branch 'main' into issue-2829
Browse files Browse the repository at this point in the history
  • Loading branch information
skedwards88 authored Oct 8, 2020
2 parents 43237e7 + a619488 commit 3992e6f
Show file tree
Hide file tree
Showing 49 changed files with 932 additions and 864 deletions.
11 changes: 10 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,15 @@
"bug",
"code"
]
},
{
"login": "BenJam",
"name": "Benjamin Nickolls",
"avatar_url": "https://avatars2.githubusercontent.com/u/158833?v=4",
"profile": "https://github.com/BenJam",
"contributions": [
"doc"
]
}
],
"contributorsPerLine": 7,
Expand All @@ -294,4 +303,4 @@
"repoHost": "https://github.com",
"skipCi": true,
"commitConvention": "none"
}
}
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: GitHub Support
url: https://support.github.com/contact
about: Contact Support if you're having trouble with your GitHub account.
44 changes: 0 additions & 44 deletions .github/ISSUE_TEMPLATE/engineering-issue.md

This file was deleted.

15 changes: 0 additions & 15 deletions .github/ISSUE_TEMPLATE/enterprise-release.md

This file was deleted.

32 changes: 26 additions & 6 deletions .github/ISSUE_TEMPLATE/improve-existing-docs.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,33 @@
---
name: Docs content issues have moved!
about: Create an issue about existing content (not upcoming releases/ships), whether reported by users or noticed by Hubbers.
name: Improve existing docs
about: Make a suggestion to improve our existing documentation.
title: ''
labels:
- Improve existing docs
- content
assignees: ''
---
# Docs content issues have moved!
<!--
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.
-->

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:
<!--
For questions, ask in Discussions: https://github.com/github/docs/discussions
# :boom::point_right:[new issue templates](https://github.com/github/docs-content/issues/new/choose):point_left::boom:
Before you file an issue read the:
- Code of Conduct: https://github.com/github/docs/blob/onboarding/CODE_OF_CONDUCT.md
- Contributing guide: https://github.com/github/docs/blob/onboarding/CONTRIBUTING.md
Check to make sure someone hasn't already opened a similar issue: https://github.com/github/docs/issues
-->

### What article on docs.github.com is affected?

<!-- Please link to the article you'd like to see updated -->

### What part(s) of the article would you like to see updated?

<!-- 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? -->

### Additional information

<!-- Add any other context or screenshots about the feature request here. -->
33 changes: 33 additions & 0 deletions .github/ISSUE_TEMPLATE/improve-the-site.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
name: Improve the docs.github.com site
about: Make a suggestions or report a problem on the docs.github.com website.
title: ''
labels: engineering
assignees: ''
---

<!--
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.
-->

<!--
For questions, ask in Discussions: https://github.com/github/docs/discussions
Before you file an issue read the:
- Code of Conduct: https://github.com/github/docs/blob/onboarding/CODE_OF_CONDUCT.md
- Contributing guide: https://github.com/github/docs/blob/onboarding/CONTRIBUTING.md
Check to make sure someone hasn't already opened a similar issue: https://github.com/github/docs/issues
-->

### What is the current behavior?

<!-- include links to articles where you're seeing a problem, screenshots, what browser you're using, etc. -->

### What changes are you suggesting?

<!-- 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? -->

### Additional information

<!-- Any additional information, configuration, or data that might be necessary to reproduce the issue. -->
27 changes: 0 additions & 27 deletions .github/ISSUE_TEMPLATE/issue-party.md

This file was deleted.

28 changes: 21 additions & 7 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,29 @@
<!--
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.
-->

<!--
Hello! Thanks for your interest in contributing to this project.
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.
Before opening a PR, please see our [CONTRIBUTING.md](https://github.com/github/docs/blob/main/CONTRIBUTING.md) for information how to contribute.
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).
Thanks again! :octocat:
-->

### Why:

Please link to a corresponding issue when you open a PR:
<!--
- If there's an existing issue for your change, please link to it.
- 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.
- 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. -->

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=).
### What's being changed:

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`.
<!-- Share artifacts of the changes, be they code snippets, GIFs or screenshots; whatever shares the most context. -->

Thanks again! :octocat:
-->
### Check off the following:
- [ ] All of the tests are passing.
- [ ] I have reviewed my changes in staging.
- [ ] For content changes, I have reviewed the [localization checklist](https://github.com/github/docs/blob/main/contributing/localization-checklist.md)
- [ ] 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).
11 changes: 11 additions & 0 deletions .github/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Configuration for welcome - https://github.com/behaviorbot/welcome

# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
# Comment to be posted to on first time issues
newIssueWelcomeComment: >
Thanks for opening this issue. A GitHub docs team member should be by to give feedback soon. In the meantime, please check out the [contributing guidelines](https://github.com/github/docs/blob/main/CONTRIBUTING.md).
# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
# Comment to be posted to on PRs from first time contributors in your repository
newPRWelcomeComment: >
Thanks for opening this pull request! A GitHub docs team member should be by to give feedback soon. In the meantime, please check out the [contributing guidelines](https://github.com/github/docs/blob/main/CONTRIBUTING.md).
4 changes: 2 additions & 2 deletions .github/workflows/merged-notification.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
issue_number: context.payload.pull_request.number,
body: `Thanks very much for contributing! Your pull request has been merged 🎉 You should see your changes appear on the site in approximately 24 hours. To add your ✨ contribution to the README.md, create a new comment in this PR with:
```
\`\`\`
@all-contributors please add @${context.payload.pull_request.user.login} for docs
```
\`\`\`
If you want to, you can use the [emoji key](https://allcontributors.org/docs/en/emoji-key) to replace docs with a different contribution type.`
})
6 changes: 6 additions & 0 deletions .github/workflows/repo-sync.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# The docs.github.com project has two repositories: github/docs (public) and github/docs-internal (private)
#
# This GitHub Actions workflow keeps the main branch of those two repos in sync.
#
# For more details, see https://github.com/repo-sync/repo-sync#how-it-works

name: Repo Sync

on:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-algolia-search-indices.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: "12.x"
node-version: 14.x
- name: cache node modules
uses: actions/cache@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 14.x

- name: Get npm cache directory
id: npm-cache
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 14.x

- name: Get npm cache directory
id: npm-cache
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 14.x

- name: Get npm cache directory
id: npm-cache
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 14.x

- name: Get npm cache directory
id: npm-cache
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 14.x

- name: Get npm cache directory
id: npm-cache
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 14.x

- name: Get npm cache directory
id: npm-cache
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/triage-issue-comments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ jobs:
return 'false'
}
- name: Label issues with new comments with 'triage'
uses: andymckay/[email protected].2
uses: rachmari/[email protected].4
if: (steps.is-internal-contributor.outputs.result == 'false')
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
add-labels: "triage"
- name: Triage to project board
uses: konradpabjan/[email protected]
uses: rachmari/actions-add-new-issue-to-column@v1.1.1
with:
action-token: ${{ secrets.GITHUB_TOKEN }}
project-url: "https://github.com/github/docs/projects/1"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/triage-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ jobs:

steps:
- name: Label new issues with 'triage'
uses: andymckay/[email protected].2
uses: rachmari/[email protected].4
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
add-labels: "triage"
- name: Triage to project board
uses: konradpabjan/[email protected]
uses: rachmari/actions-add-new-issue-to-column@v1.1.1
with:
action-token: ${{ secrets.GITHUB_TOKEN }}
project-url: "https://github.com/github/docs/projects/1"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/triage-pull-requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ on:
types: [reopened, opened]

jobs:
triage_issues:
triage_pulls:
if: github.repository == 'github/docs'
runs-on: ubuntu-latest

steps:
- name: Label new pull requests with 'triage'
uses: andymckay/[email protected].2
uses: rachmari/[email protected].4
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
add-labels: "triage"
- name: Triage to project board
uses: konradpabjan/[email protected]
uses: rachmari/actions-add-new-issue-to-column@v1.1.1
with:
action-token: ${{ secrets.GITHUB_TOKEN }}
project-url: "https://github.com/github/docs/projects/1"
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12.8.0
14.13.0
Loading

0 comments on commit 3992e6f

Please sign in to comment.