diff --git a/.github/ISSUE_COMMENT_TEMPLATE/quick-status.yml b/.github/ISSUE_COMMENT_TEMPLATE/quick-status.yml new file mode 100644 index 0000000000..8dd47930aa --- /dev/null +++ b/.github/ISSUE_COMMENT_TEMPLATE/quick-status.yml @@ -0,0 +1,27 @@ +--- +name: A brief status update +description: A brief status update. +body: + - type: dropdown + attributes: + label: Status + options: + - label: 'GREY ⚪️ (Not started, paused, not currently being worked on)' + value: 'Status: GREY' + - label: 'GREEN 🟢 (All good, smooth sailing)' + value: 'Status: GREEN' + - label: "YELLOW \U0001F7E1 (On track, with hurdles to work through)" + value: 'Status: YELLOW' + - label: "RED \U0001F534 (BLOCKED)" + value: 'Status: RED' + - type: textarea + attributes: + label: Update Summary + placeholder: + Brief summary of the status and next steps. Any blockers should be + called out specifically. + - type: input + attributes: + label: 'Attribution' + value: '_created with :heart: by typing_ `/status`' + format: text diff --git a/.github/ISSUE_COMMENT_TEMPLATE/status.yml b/.github/ISSUE_COMMENT_TEMPLATE/status.yml deleted file mode 100644 index 9c5338392e..0000000000 --- a/.github/ISSUE_COMMENT_TEMPLATE/status.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -name: Status Update -about: A brief status update. -body: - - type: dropdown - attributes: - name: Status - options: - - name: "GREEN \U0001F34F (All good, smooth sailing)" - value: 'Status: GREEN' - - name: "YELLOW \U0001F7E1 (On track, with hurdles to work through)" - value: 'Status: YELLOW' - - name: "RED \U0001F534 (BLOCKED)" - value: 'Status: RED' - - type: input - attributes: - name: Update Summary - placeholder: - Brief summary of the status and next steps. Any blockers should be - called out specifically. - inputType: longText - - type: input - attributes: - name: 'Attribution' - value: '_created with :heart: by typing_ `/status`' - inputType: text diff --git a/.github/ISSUE_COMMENT_TEMPLATE/target-date.yml b/.github/ISSUE_COMMENT_TEMPLATE/target-date.yml deleted file mode 100644 index 1aaa0e3a08..0000000000 --- a/.github/ISSUE_COMMENT_TEMPLATE/target-date.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -name: Target Date Update -about: Target date update -body: - - type: input - attributes: - name: Target completion date - placeholder: With context if the target completion date has changed - inputType: text - - type: input - attributes: - name: 'Attribution' - value: '_created with :heart: by typing_ `/status`' - inputType: text diff --git a/.github/actions-scripts/check-for-enterprise-issues-by-label.js b/.github/actions-scripts/check-for-enterprise-issues-by-label.js new file mode 100755 index 0000000000..0b699781a9 --- /dev/null +++ b/.github/actions-scripts/check-for-enterprise-issues-by-label.js @@ -0,0 +1,27 @@ +#!/usr/bin/env node + +const github = require('@actions/github') +const core = require('@actions/core') + +async function run () { + const token = process.env.GITHUB_TOKEN + const octokit = github.getOctokit(token) + const query = encodeURIComponent('is:open repo:github/docs-internal is:issue') + + const deprecationIssues = await octokit.request(`GET /search/issues?q=${query}+label:"enterprise%20deprecation"`) + const releaseIssues = await octokit.request(`GET /search/issues?q=${query}+label:"enterprise%20release"`) + const isDeprecationIssue = deprecationIssues.data.items.length === 0 ? 'false' : 'true' + const isReleaseIssue = releaseIssues.data.items.length === 0 ? 'false' : 'true' + core.setOutput('deprecationIssue', isDeprecationIssue) + core.setOutput('releaseIssue', isReleaseIssue) + return `Set outputs deprecationIssue: ${isDeprecationIssue}, releaseIssue: ${isReleaseIssue}` +} + +run() + .then( + (response) => { console.log(`Finished running: ${response}`) }, + (error) => { + console.log(`#ERROR# ${error}`) + process.exit(1) + } + ) diff --git a/.github/actions-scripts/create-enterprise-issue.js b/.github/actions-scripts/create-enterprise-issue.js new file mode 100755 index 0000000000..d726c0d7e7 --- /dev/null +++ b/.github/actions-scripts/create-enterprise-issue.js @@ -0,0 +1,148 @@ +#!/usr/bin/env node + +const fs = require('fs') +const path = require('path') +const github = require('@actions/github') +const enterpriseDates = require('../../lib/enterprise-dates') +const { latest, oldestSupported } = require('../../lib/enterprise-server-releases') +const acceptedMilestones = ['release', 'deprecation'] +const teamsToCC = '/cc @github/docs-content @github/docs-engineering' + +// Adjust these values as needed. +const numberOfdaysBeforeReleaseToOpenIssue = 30 +const numberOfdaysBeforeDeprecationToOpenIssue = 15 + +// [start-readme] +// +// This script runs once per day via a scheduled GitHub Action to check whether +// an Enterprise release or deprecation milestone is within the specified +// number of days. +// +// When a milestone is within the specified number of days, a new issue is +// created using the templates in +// .github/actions-scripts/enterprise-server-issue-templates. +// +// Release issues are then added to the docs content squad board for triage. +// Deprecations issues are owned by docs engineering and are added to the +// docs engineering squad board automatically when the engineering label is added. +// +// [end-readme] + +run() + +async function run () { + + + const milestone = process.argv[2] + if (!acceptedMilestones.includes(milestone)) { + console.log('Please specify either \'release\' or \'deprecation\'\n') + console.log('Example: script/open-enterprise-issue.js release') + process.exit(1) + } + + // Milestone-dependent values. + const numberOfdaysBeforeMilestoneToOpenIssue = milestone === 'release' + ? numberOfdaysBeforeReleaseToOpenIssue + : numberOfdaysBeforeDeprecationToOpenIssue + + const versionNumber = milestone === 'release' + ? getNextVersionNumber() + : oldestSupported + + if (!versionNumber) { + console.log(`Could not find the next version number after ${latest} in enterprise-dates.json. Try running script/udpate-enterprise-dates.js, then rerun this script.`) + process.exit(0) + } + + const datesForVersion = enterpriseDates[versionNumber] + + if (!datesForVersion) { + console.log(`Could not find ${versionNumber} in enterprise-dates.json. Try running script/udpate-enterprise-dates.js, then rerun this script.`) + process.exit(0) + } + + const nextMilestoneDate = datesForVersion[`${milestone}Date`] + const daysUntilMilestone = calculateDaysUntilMilestone(nextMilestoneDate) + + // If the milestone is more than the specific days away, exit now. + if (daysUntilMilestone > numberOfdaysBeforeMilestoneToOpenIssue) { + console.log(`The ${versionNumber} ${milestone} is not until ${nextMilestoneDate}! An issue will be opened when it is ${numberOfdaysBeforeMilestoneToOpenIssue} days away.`) + process.exit(0) + } + + const milestoneSteps = fs.readFileSync(path.join(process.cwd(), `.github/actions-scripts/enterprise-server-issue-templates/${milestone}-issue.md`), 'utf8') + const issueLabels = [`enterprise ${milestone}`, `engineering`] + const issueTitle = `[${nextMilestoneDate}] Enterprise Server ${versionNumber} ${milestone} (technical steps)` + + const issueBody = `GHES ${versionNumber} ${milestone} occurs on ${nextMilestoneDate}. + \n${milestoneSteps} + ${teamsToCC}` + + const token = process.env.GITHUB_TOKEN + + // Create the milestone issue + const octokit = github.getOctokit(token) + try { + issue = await octokit.request('POST /repos/{owner}/{repo}/issues', { + owner: 'github', + repo: 'docs-internal', + title: issueTitle, + body: issueBody, + labels: issueLabels + }) + if (issue.status === 201) { + // Write the values to disk for use in the workflow. + console.log(`Issue #${issue.data.number} for the ${versionNumber} ${milestone} was opened: ${issue.data.html_url}`) + } + } catch (error) { + console.error(`#ERROR# ${error}`) + console.log(`🛑 There was an error creating the issue.`) + process.exit(1) + } + + // Add the release issue to the 'Needs triage' column on the + // docs content squad project board: + // https://github.com/orgs/github/projects/1773#column-12198119 + // Deprecation issues are owned by docs engineering only and will + // be triaged by adding the engineering label to the issue. + if (milestone === 'release') { + try { + const addCard = await octokit.request('POST /projects/columns/{column_id}/cards', { + column_id: 12198119, + content_id: issue.data.id, + content_type: 'Issue', + mediaType: { + previews: [ + 'inertia' + ] + } + }) + + if (addCard.status === 201) { + // Write the values to disk for use in the workflow. + console.log(`The issue #${issue.data.number} was added to https://github.com/orgs/github/projects/1773#column-12198119.`) + } + } catch(error) { + console.error(`#ERROR# ${error}`) + console.log(`🛑 There was an error adding the issue to the project board.`) + process.exit(1) + } + } +} + +function getNextVersionNumber () { + const indexOfLatest = Object.keys(enterpriseDates).indexOf(latest) + const indexOfNext = indexOfLatest + 1 + return Object.keys(enterpriseDates)[indexOfNext] +} + +function calculateDaysUntilMilestone (nextMilestoneDate) { + const today = new Date().toISOString().slice(0, 10) + const differenceInMilliseconds = getTime(nextMilestoneDate) - getTime(today) + // Return the difference in days + return Math.floor((differenceInMilliseconds) / (1000 * 60 * 60 * 24)) +} + +function getTime (date) { + return new Date(date).getTime() +} diff --git a/.github/actions-scripts/enterprise-server-issue-templates/deprecation-issue.md b/.github/actions-scripts/enterprise-server-issue-templates/deprecation-issue.md new file mode 100644 index 0000000000..85dde8a437 --- /dev/null +++ b/.github/actions-scripts/enterprise-server-issue-templates/deprecation-issue.md @@ -0,0 +1,57 @@ +## Overview + +The day after a GHES version's [deprecation date](https://github.com/github/docs-internal/tree/main/lib/enterprise-dates.json), a banner on the docs will say: `This version was deprecated on .` This is all users need to know. However, we don't want to update those docs anymore or link to them in the nav. Follow the steps in this issue to **archive** the docs. + +**Note**: Do each step below in a separate PR. Only move on to the next step when the previous PR has been merged. + +## Step 1: Scrape the docs and archive the files + +- [ ] In your checkout of the [repo with archived GHES content](https://github.com/github/help-docs-archived-enterprise-versions), create a new branch: `git checkout -b deprecate-` +- [ ] In your `docs-internal` checkout, download the static files for the oldest supported version into your archival checkout: + ``` + $ script/enterprise-server-deprecations/archive-version.js -p + ``` + If your checkouts live in the same directory, this command would be: + ``` + $ script/enterprise-server-deprecations/archive-version.js -p ../help-docs-archived-enterprise-versions + ``` + **Note:** You can pass the `--dry-run` flag to scrape only the first 10 pages plus their redirects for testing purposes. + +## Step 2: Upload the assets directory to Azure storage + +- [ ] Log in to the Azure portal from Okta. Navigate to the [githubdocs Azure Storage Blob resoruce](https://portal.azure.com/#@githubazure.onmicrosoft.com/resource/subscriptions/fa6134a7-f27e-4972-8e9f-0cedffa328f1/resourceGroups/docs-production/providers/Microsoft.Storage/storageAccounts/githubdocs/overview). +- [ ] Click the "Open in Explorer" button to the right of search box.If you haven't already, click the download link to download "Microsoft Azure Storage Explorer." To login to the app, click the plug icon in the left sidebar and click the option to "add an azure account." When you login, you'll need a yubikey to authenticate through Okta. +- [ ] From the Microsoft Azure Storage Explorer app, select the `githubdocs` storage account resource and navigate to the `github-images` blob container. +- [ ] Click "Upload" and select "Upload folder." Click the "Selected folder" input to navigate to the `help-docs-archived-enterprise-versions` repository and select the `assets` directory for the version you just generated. In the "Destination folder" input, add the version number. For example, `/enterprise/2.22/`. +- [ ] Check the log to ensure all files were uploaded successfully. +- [ ] Removed the `assets` directory from the `/help-docsc-archived-enterprise-versions` repository. + +## Step 3: Commit and push changes to help-docs-archived-enterprise-versions repo + +- [ ] In your archival checkout, `git add `, commit, and push. +- [ ] Open a PR and merge it in. Note that the version will _not_ be deprecated on the docs site until you do the next step. + +## Step 4: Deprecate the version in docs-internal + +In your `docs-internal` checkout: +- [ ] Create a new branch: `git checkout -b deprecate-`. +- [ ] Edit `lib/enterprise-server-releases.js` by moving the number to be deprecated into the `deprecated` array. +- [ ] Run `script/enterprise-server-deprecations/remove-static-files.js` and commit results. +- [ ] Manually remove entries for the deprecated version from `lib/redirects/static/developer-docs-routes-for-supported-versions.json`. + - **Note**: These entries only go up to 2.21. We can remove this step once 2.21 is deprecated. +- [ ] Open a new PR. Make sure to check the following: + - [ ] Tests are passing. + - [ ] The deprecated version renders on staging as expected. + - [ ] The new oldest supported version renders on staging as expected. Also check the banner text. +- [ ] When the PR is approved, merge it in to complete the deprecation. + +## Step 5: Remove outdated Liquid markup and frontmatter + +The following steps are somewhat optional and can be completed at any time. They do not have user impact; they just clear out old Liquid statements for the deprecated version, which makes things easier for content writers. + +In your `docs-internal` checkout: +- [ ] Create a new branch: `git checkout -b remove--markup` +- [ ] Run the script: `script/remove-deprecated-enterprise-version-markup.js --release `. +- [ ] Spot check a few changes. Content, frontmatter, and data files should all have been updated. +- [ ] Open a PR with the results. The diff may be large and complex, so make sure to get a review from `@github/docs-content`. +- [ ] Debug any test failures or unexpected results. diff --git a/.github/actions-scripts/enterprise-server-issue-templates/release-issue.md b/.github/actions-scripts/enterprise-server-issue-templates/release-issue.md new file mode 100644 index 0000000000..a5af78515c --- /dev/null +++ b/.github/actions-scripts/enterprise-server-issue-templates/release-issue.md @@ -0,0 +1,53 @@ +## To enable the new version + +**Do these steps in a local checkout to create a GHES release branch with passing tests:** + +- [ ] In [lib/enterprise-server-releases.js](https://github.com/github/docs-internal/blob/main/lib/enterprise-server-releases.js): + - [ ] Prepend the new release number to the `supported` array. + - [ ] Increment the `next` variable above the `supported` array (e.g., new release number + `.1`) +- [ ] Update the GHES dates file (requires a PAT in a local `.env` file): + ``` + script/update-enterprise-dates.js + ``` +- [ ] Create REST files based on previous version: + ``` + script/enterprise-server-releases/create-rest-files.js --oldVersion --newVersion + ``` +- [ ] Create GraphQL files based on previous version: + ``` + script/enterprise-server-releases/create-graphql-files.js --oldVersion --newVersion + ``` +- [ ] Create webhook files based on previous version: + ``` + script/enterprise-server-release/create-webhook-files.js --oldVersion --newVersion + ``` +- [ ] (Optional) Add a Release Candidate banner: + ``` + script/enterprise-server-releases/release-banner.js --action create --version + ``` + +### When the `docs-internal` release branch is open + +- [ ] Add a label to the PR in this format: + ``` + sync-english-index-for- + ``` + ☝️ This will run a workflow **on every push to the PR** that will sync **only** the English index for the new version to Algolia. This will make the GHES content searchable on staging throughout content creation, and will ensure the search updates go live at the same time the content is published. See [`contributing/search.md`](https://github.com/github/docs-internal/blob/main/contributing/search.md) for details. + +- [ ] Create an OpenAPI topic branch + + This branch is used to avoid propagating the OpenAPI dev mode check CI test failure in all of the branches. All changes that affect the OpenAPI schema should branch off of this topic branch. The tests should all be passing before the OpenAPI topic branch is merged into the megabranch. + + For more information about how OpenAPI changes are published to docs.github.com, see [Publishing REST API changes to docs.github.com](https://github.com/github/docs-content/blob/main/docs-content-docs/docs-content-workflows/publishing-documentation/publishing-REST-api-docs.md#publishing-rest-api-changes-to-docsgithubcom). + +- [ ] In `github/github`, to create a new GHES release follow these steps: + - [ ] Copy the previous release's root document to a new root document for this release `cp app/api/description/ghes-.yaml app/api/description/ghes-.yaml`. + - [ ] Update the `externalDocs.url` property in that file to use the new GHES release number. + - [ ] Copy the previous release's configuration file to a new configuration file for this release `cp app/api/description/config/releases/ghes-.yaml app/api/description/config/releases/ghes-.yaml`. + - [ ] Update the `variables.externalDocsUrl`, `variables.ghesVersion`, and `patch.[].value.url` in that file to use the new GHES release number. + - [ ] Update `published` in that file to `false`. **Note:** This is important to ensure that 3.1 OpenAPI changes are not made public until 3.1 is released. + +### Before shipping the release branch + +- [ ] Add the GHES release notes to `data/release-notes/` and update the versioning frontmatter in `content/admin/release-notes.md` to `enterprise-server: '<='` +- [ ] In `github/github`, open a PR to change `published` to `true` in `app/api/description/config/releases/ghes-.yaml`. Get the required approval from `@github/ecosystem-api-reviewers` then deploy to dotcom. This process generally takes 30-90 minutes. Ask in `#docs-ecosystem` if you need help with this. diff --git a/.github/allowed-actions.js b/.github/allowed-actions.js index 23a12cebbe..a7cad0cd4f 100644 --- a/.github/allowed-actions.js +++ b/.github/allowed-actions.js @@ -20,13 +20,13 @@ module.exports = [ "cschleiden/actions-linter@0ff16d6ac5103cca6c92e6cbc922b646baaea5be", "dawidd6/action-delete-branch@47743101a121ad657031e6704086271ca81b1911", "docker://chinthakagodawita/autoupdate-action:v1", - "fkirc/skip-duplicate-actions@36feb0d8d062137530c2e00bd278d138fe191289", "github/codeql-action/analyze@v1", "github/codeql-action/init@v1", "juliangruber/approve-pull-request-action@c530832d4d346c597332e20e03605aa94fa150a8", "juliangruber/find-pull-request-action@2fc55e82a6d5d36fe1e7f1848f7e64fd02d99de9", "juliangruber/read-file-action@e0a316da496006ffd19142f0fd594a1783f3b512", "lee-dohm/close-matching-issues@22002609b2555fe18f52b8e2e7c07cbf5529e8a8", + "lee-dohm/no-response@9bb0a4b5e6a45046f00353d5de7d90fb8bd773bb", "pascalgn/automerge-action@c9bd1823770819dc8fb8a5db2d11a3a95fbe9b07", //pascalgn/automerge@0.12.0 "peter-evans/create-issue-from-file@a04ce672e3acedb1f8e416b46716ddfd09905326", "peter-evans/create-or-update-comment@5221bf4aa615e5c6e95bb142f9673a9c791be2cd", diff --git a/.github/commands/remove.yaml b/.github/commands/remove.yaml deleted file mode 100644 index e527282ee3..0000000000 --- a/.github/commands/remove.yaml +++ /dev/null @@ -1,10 +0,0 @@ -trigger: remove-from-fr-board -title: Remove from FR board -description: Remove the current issue or pull request from the project board for the docs content first responder -surfaces: - - issue - - pull_request - - discussion -steps: - - type: repository_dispatch - eventType: remove_from_FR_board diff --git a/.github/workflows/60-days-stale-check.yml b/.github/workflows/60-days-stale-check.yml index 18e4333f9a..24ba31594c 100644 --- a/.github/workflows/60-days-stale-check.yml +++ b/.github/workflows/60-days-stale-check.yml @@ -20,7 +20,7 @@ jobs: stale-pr-message: 'This PR is stale because it has been open 60 days with no activity.' days-before-stale: 60 days-before-close: -1 - only-labels: 'engineering' + only-labels: 'engineering,Triaged,Improve existing docs,Core,Ecosystem' stale-issue-label: 'stale' stale-pr-label: 'stale' exempt-pr-labels: 'never-stale' diff --git a/.github/workflows/browser-test.yml b/.github/workflows/browser-test.yml index 53a74e6259..79dff097b1 100644 --- a/.github/workflows/browser-test.yml +++ b/.github/workflows/browser-test.yml @@ -12,44 +12,26 @@ on: pull_request: jobs: - see_if_should_skip: - continue-on-error: true - runs-on: ubuntu-latest - # Map a step output to a job output - outputs: - should_skip: ${{ steps.skip_check.outputs.should_skip }} - steps: - - id: skip_check - uses: fkirc/skip-duplicate-actions@36feb0d8d062137530c2e00bd278d138fe191289 - with: - cancel_others: 'false' - github_token: ${{ github.token }} - paths: '[".github/workflows/browser-test.yml","assets/**", "content/**", "data/**", "includes/**", "javascripts/**", "jest-puppeteer.config.js", "jest.config.js", "layouts/**", "lib/**", "middleware/**", "package-lock.json", "package.json", "server.js", "translations/**", "webpack.config.js"]' build: - needs: see_if_should_skip runs-on: ubuntu-latest steps: # Each of these ifs needs to be repeated at each step to make sure the required check still runs # Even if if doesn't do anything - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Checkout + - name: Checkout uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Setup Node + - name: Setup Node uses: actions/setup-node@c46424eee26de4078d34105d3de3cc4992202b1e with: node-version: 14.x - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Install + - name: Install uses: rachmari/puppeteer-container@6d56d6e132a3df76cf60bc290a4282f7fbaed05e timeout-minutes: 5 with: args: npm ci - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Test + - name: Test timeout-minutes: 10 uses: rachmari/puppeteer-container@6d56d6e132a3df76cf60bc290a4282f7fbaed05e with: diff --git a/.github/workflows/check-for-spammy-issues.yml b/.github/workflows/check-for-spammy-issues.yml index 12ad0f9706..573eecb0ed 100644 --- a/.github/workflows/check-for-spammy-issues.yml +++ b/.github/workflows/check-for-spammy-issues.yml @@ -65,3 +65,14 @@ jobs: issue_number: issue.number, body: "This issue appears to have been opened accidentally. I'm going to close it now, but feel free to open a new issue or ask any questions in [discussions](https://github.com/github/docs/discussions)!" }); + + // Add the issue to the Done column on the triage board + try { + await github.projects.createCard({ + column_id: 11167427, + content_id: context.payload.issue.id, + content_type: "Issue" + }); + } catch (error) { + console.log(error); + } diff --git a/.github/workflows/close-external-repo-sync-prs.yml b/.github/workflows/close-external-repo-sync-prs.yml deleted file mode 100644 index 40f95738a4..0000000000 --- a/.github/workflows/close-external-repo-sync-prs.yml +++ /dev/null @@ -1,65 +0,0 @@ -name: Check for External Repo Sync PR - -# **What it does**: If someone made a repo sync pull request other than Octomerger, close it. -# **Why we have it**: Another form of spam in the open-source repository. -# **Who does it impact**: Open-source contributors. - -on: - pull_request: - types: - - opened - - reopened - branches: - - main - -jobs: - invalid-repo-sync-check: - name: Close external Repo Sync PRs - if: ${{ github.repository == 'github/docs' && github.head_ref == 'repo-sync' }} - runs-on: ubuntu-latest - steps: - - uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9 - with: - github-token: ${{ secrets.DOCUBOT_FR_PROJECT_BOARD_WORKFLOWS_REPO_ORG_READ_SCOPES }} - script: | - - const prCreator = context.payload.sender.login - - // If the PR creator is the expected account, stop now - if (prCreator === 'Octomerger') { - return - } - - try { - await github.teams.getMembershipForUserInOrg({ - org: 'github', - team_slug: 'employees', - username: prCreator - }) - - // If the PR creator is a GitHub employee, stop now - return - } catch (err) { - // An error will be thrown if the user is not a GitHub employee. - // That said, we still want to proceed anyway! - } - - const pr = context.payload.pull_request - const { owner, repo } = context.repo - - // Close the PR and add the invalid label - await github.issues.update({ - owner: owner, - repo: repo, - issue_number: pr.number, - labels: ['invalid'], - state: 'closed' - }) - - // Comment on the PR - await github.issues.createComment({ - owner: owner, - repo: repo, - issue_number: pr.number, - body: "Please leave this `repo-sync` branch to the robots!\n\nI'm going to close this pull request now, but feel free to open a new issue or ask any questions in [discussions](https://github.com/github/docs/discussions)!" - }) diff --git a/.github/workflows/confirm-internal-staff-work-in-docs.yml b/.github/workflows/confirm-internal-staff-work-in-docs.yml index 60dc9fa9bc..6edcebf2e2 100644 --- a/.github/workflows/confirm-internal-staff-work-in-docs.yml +++ b/.github/workflows/confirm-internal-staff-work-in-docs.yml @@ -17,7 +17,7 @@ jobs: check-team-membership: runs-on: ubuntu-latest continue-on-error: true - if: github.repository == 'github/docs' + if: github.repository == 'github/docs' && github.actor != 'docs-bot' steps: - id: membership_check uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9 diff --git a/.github/workflows/link-check-dotcom.yml b/.github/workflows/link-check-dotcom.yml index 399655cf86..bb9f024ab1 100644 --- a/.github/workflows/link-check-dotcom.yml +++ b/.github/workflows/link-check-dotcom.yml @@ -12,53 +12,26 @@ on: pull_request: jobs: - see_if_should_skip: - continue-on-error: true - runs-on: ubuntu-latest - # Map a step output to a job output - outputs: - should_skip: ${{ steps.skip_check.outputs.should_skip }} - steps: - - id: skip_check - uses: fkirc/skip-duplicate-actions@36feb0d8d062137530c2e00bd278d138fe191289 - with: - cancel_others: 'false' - github_token: ${{ github.token }} - paths: '[".github/workflows/link-check-dotcom.yml", "assets/**", "content/**", "data/**", "includes/**", "javascripts/**", "jest-puppeteer.config.js", "jest.config.js", "layouts/**", "lib/**", "middleware/**", "package-lock.json", "package.json", "server.js", "translations/**", "webpack.config.js"]' build: - needs: see_if_should_skip runs-on: ${{ fromJSON('["ubuntu-latest", "self-hosted"]')[github.repository == 'github/docs-internal'] }} steps: # Each of these ifs needs to be repeated at each step to make sure the required check still runs # Even if if doesn't do anything - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Checkout + - name: Checkout uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Setup node + - name: Setup node uses: actions/setup-node@c46424eee26de4078d34105d3de3cc4992202b1e with: node-version: 14.x - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Install + - name: Install run: npm ci - ## TODO - # - if: ${{ github.repository == 'github/docs-internal' && needs.see_if_should_skip.outputs.should_skip != 'true' }} - # name: Clone early access - # run: npm run heroku-postbuild - # env: - # DOCUBOT_REPO_PAT: ${{ secrets.DOCUBOT_REPO_PAT }} - # GIT_BRANCH: ${{ github.head_ref || github.ref }} - - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Build + - name: Build run: npm run build - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: 'Link check: Dotcom' + - name: 'Link check: Dotcom' env: DOCS_VERSION: 'dotcom' run: npm run link-check diff --git a/.github/workflows/link-check-ghae.yml b/.github/workflows/link-check-ghae.yml index e5dd16853b..3f466eae5d 100644 --- a/.github/workflows/link-check-ghae.yml +++ b/.github/workflows/link-check-ghae.yml @@ -12,53 +12,26 @@ on: pull_request: jobs: - see_if_should_skip: - continue-on-error: true - runs-on: ubuntu-latest - # Map a step output to a job output - outputs: - should_skip: ${{ steps.skip_check.outputs.should_skip }} - steps: - - id: skip_check - uses: fkirc/skip-duplicate-actions@36feb0d8d062137530c2e00bd278d138fe191289 - with: - cancel_others: 'false' - github_token: ${{ github.token }} - paths: '[".github/workflows/link-check-ghae.yml", "assets/**", "content/**", "data/**", "includes/**", "javascripts/**", "jest-puppeteer.config.js", "jest.config.js", "layouts/**", "lib/**", "middleware/**", "package-lock.json", "package.json", "server.js", "translations/**", "webpack.config.js"]' build: - needs: see_if_should_skip runs-on: ${{ fromJSON('["ubuntu-latest", "self-hosted"]')[github.repository == 'github/docs-internal'] }} steps: # Each of these ifs needs to be repeated at each step to make sure the required check still runs # Even if if doesn't do anything - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Checkout + - name: Checkout uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Setup node + - name: Setup node uses: actions/setup-node@c46424eee26de4078d34105d3de3cc4992202b1e with: node-version: 14.x - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Install + - name: Install run: npm ci - ## TODO - # - if: ${{ github.repository == 'github/docs-internal' && needs.see_if_should_skip.outputs.should_skip != 'true' }} - # name: Clone early access - # run: npm run heroku-postbuild - # env: - # DOCUBOT_REPO_PAT: ${{ secrets.DOCUBOT_REPO_PAT }} - # GIT_BRANCH: ${{ github.head_ref || github.ref }} - - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Build + - name: Build run: npm run build - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: 'Link check: GitHub AE' + - name: 'Link check: GitHub AE' env: DOCS_VERSION: 'github-ae' run: npm run link-check diff --git a/.github/workflows/link-check-ghes.yml b/.github/workflows/link-check-ghes.yml index 4371f129fb..f26b9cfbe6 100644 --- a/.github/workflows/link-check-ghes.yml +++ b/.github/workflows/link-check-ghes.yml @@ -12,53 +12,26 @@ on: pull_request: jobs: - see_if_should_skip: - continue-on-error: true - runs-on: ubuntu-latest - # Map a step output to a job output - outputs: - should_skip: ${{ steps.skip_check.outputs.should_skip }} - steps: - - id: skip_check - uses: fkirc/skip-duplicate-actions@36feb0d8d062137530c2e00bd278d138fe191289 - with: - cancel_others: 'false' - github_token: ${{ github.token }} - paths: '[".github/workflows/link-check-ghes.yml", "assets/**", "content/**", "data/**", "includes/**", "javascripts/**", "jest-puppeteer.config.js", "jest.config.js", "layouts/**", "lib/**", "middleware/**", "package-lock.json", "package.json", "server.js", "translations/**", "webpack.config.js"]' build: - needs: see_if_should_skip runs-on: ${{ fromJSON('["ubuntu-latest", "self-hosted"]')[github.repository == 'github/docs-internal'] }} steps: # Each of these ifs needs to be repeated at each step to make sure the required check still runs # Even if if doesn't do anything - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Checkout + - name: Checkout uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Setup node + - name: Setup node uses: actions/setup-node@c46424eee26de4078d34105d3de3cc4992202b1e with: node-version: 14.x - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Install + - name: Install run: npm ci - ## TODO - # - if: ${{ github.repository == 'github/docs-internal' && needs.see_if_should_skip.outputs.should_skip != 'true' }} - # name: Clone early access - # run: npm run heroku-postbuild - # env: - # DOCUBOT_REPO_PAT: ${{ secrets.DOCUBOT_REPO_PAT }} - # GIT_BRANCH: ${{ github.head_ref || github.ref }} - - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Build + - name: Build run: npm run build - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: 'Link check: Enterprise Server' + - name: 'Link check: Enterprise Server' env: DOCS_VERSION: 'enterprise-server' run: npm run link-check diff --git a/.github/workflows/move-reopened-issues-to-triage.yaml b/.github/workflows/move-reopened-issues-to-triage.yaml new file mode 100644 index 0000000000..415c97d8c8 --- /dev/null +++ b/.github/workflows/move-reopened-issues-to-triage.yaml @@ -0,0 +1,41 @@ +name: Move Reopened Issues to Triage + +# **What it does**: Moves issues that are reopened from the Done column to the Triage column. +# **Why we have it**: To prevent having to do this manually. +# **Who does it impact**: Open-source. + +on: + issues: + types: + - reopened + +jobs: + move-reopened-issue-to-triage: + if: github.repository == 'github/docs' + runs-on: ubuntu-latest + steps: + - uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9 + with: + github-token: ${{ github.token }} + script: | + const issueNumber = context.issue.number; + const doneColumnId = 11167427; + const triageColumnId = 11007039; + + try { + const cards = await github.projects.listCards({ + column_id: doneColumnId + }); + + for (const card of cards) { + if (card.content_url.endsWith(`/${issueNumber}`)) { + await github.projects.moveCard({ + card_id: card.id, + position: 'position', + column_id: triageColumnId + }); + } + } + } catch(e) { + console.log(error); + } diff --git a/.github/workflows/no-response.yaml b/.github/workflows/no-response.yaml new file mode 100644 index 0000000000..1e40520619 --- /dev/null +++ b/.github/workflows/no-response.yaml @@ -0,0 +1,30 @@ +name: No Response + +# **What it does**: Closes issues that don't have enough information to be +# actionable. +# **Why we have it**: To remove the need for maintainers to remember to check +# back on issues periodically to see if contributors have +# responded. +# **Who does it impact**: Everyone that works on docs or docs-internal. + +on: + issue_comment: + types: created + + schedule: + # Schedule for five minutes after the hour every hour + - cron: '5 * * * *' + +jobs: + noResponse: + runs-on: ubuntu-latest + steps: + - uses: lee-dohm/no-response@9bb0a4b5e6a45046f00353d5de7d90fb8bd773bb + with: + token: ${{ github.token }} + closeComment: > + This issue has been automatically closed because there has been no response + to our request for more information from the original author. With only the + information that is currently in the issue, we don't have enough information + to take action. Please reach out if you have or find the answers we need so + that we can investigate further. See [this blog post on bug reports and the importance of repro steps](https://www.lee-dohm.com/2015/01/04/writing-good-bug-reports/) for more information about the kind of information that may be helpful. diff --git a/.github/workflows/open-enterprise-issue.yml b/.github/workflows/open-enterprise-issue.yml new file mode 100644 index 0000000000..4ec44ba564 --- /dev/null +++ b/.github/workflows/open-enterprise-issue.yml @@ -0,0 +1,47 @@ +name: Open Enterprise release or deprecation issue + +on: + schedule: + - cron: '49 14 * * *' # At 14:49 UTC daily + +jobs: + open_enterprise_issue: + name: Open Enterprise issue + if: github.repository == 'github/docs-internal' + runs-on: ubuntu-latest + steps: + - name: Check for existing release or deprecation issues + id: existingIssue + run: | + .github/actions-scripts/check-for-enterprise-issues-by-label.js + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + if: steps.existingIssue.outputs.deprecationIssue == 'false' || steps.existingIssue.outputs.releaseIssue == 'false' + + - name: npm ci + if: steps.existingIssue.outputs.deprecationIssue == 'false' || steps.existingIssue.outputs.releaseIssue == 'false' + run: npm ci + + - name: npm run build + if: steps.existingIssue.outputs.deprecationIssue == 'false' || steps.existingIssue.outputs.releaseIssue == 'false' + run: npm run build + + - name: Update enterprise dates + if: steps.existingIssue.outputs.deprecationIssue == 'false' || steps.existingIssue.outputs.releaseIssue == 'false' + run: | + script/update-enterprise-dates.js + + - name: Create an enterprise release issue + if: steps.existingIssue.outputs.releaseIssue == 'false' + run: | + .github/actions-scripts/create-enterprise-issue.js release + env: + GITHUB_TOKEN: ${{ secrets.DOCUBOT_FR_PROJECT_BOARD_WORKFLOWS_REPO_ORG_READ_SCOPES }} + - name: Create an enterprise deprecation issue + if: steps.existingIssue.outputs.deprecationIssue == 'false' + run: | + .github/actions-scripts/create-enterprise-issue.js deprecation + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/repo-freeze-reminders.yml b/.github/workflows/repo-freeze-reminders.yml index 31bf10320a..1035288878 100644 --- a/.github/workflows/repo-freeze-reminders.yml +++ b/.github/workflows/repo-freeze-reminders.yml @@ -6,7 +6,7 @@ name: Repo Freeze Reminders on: schedule: - - cron: '00 11 * * *' # once per day around 11:00am UTC + - cron: '9 11 * * *' # once per day around 11:09am UTC env: FREEZE: ${{ secrets.FREEZE }} diff --git a/.github/workflows/repo-sync-stalls.yml b/.github/workflows/repo-sync-stalls.yml index 79e1da8c9c..6a40377c5e 100644 --- a/.github/workflows/repo-sync-stalls.yml +++ b/.github/workflows/repo-sync-stalls.yml @@ -7,7 +7,7 @@ name: Repo Sync Stalls on: workflow_dispatch: schedule: - - cron: '0 */2 * * *' + - cron: '32 */2 * * *' # At minute 32 past every 2nd hour. jobs: repo-sync-stalls: diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index 7bb8872f5e..d91b0180a8 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -1,13 +1,18 @@ # 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. +# 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 -# **What it does**: Syncs docs and docs-internal. -# **Why we have it**: To keep the open-source repository up-to-date, while still having an internal repository for sensitive work. +# **What it does**: +# - close-invalid-repo-sync: Close repo sync pull requests not created by Octomerger or a Hubber. +# - repo-sync: Syncs docs and docs-internal. +# **Why we have it**: +# - close-invalid-repo-sync: Another form of spam prevention for the open-source repository. +# - repo-sync: To keep the open-source repository up-to-date, while still having an internal +# repository for sensitive work. # **Who does it impact**: Open-source. on: @@ -16,7 +21,73 @@ on: - cron: '*/15 * * * *' # every 15 minutes jobs: + close-invalid-repo-sync: + name: Close invalid Repo Sync PRs + runs-on: ubuntu-latest + steps: + - name: Find pull request + if: ${{ github.repository == 'github/docs' }} + uses: juliangruber/find-pull-request-action@2fc55e82a6d5d36fe1e7f1848f7e64fd02d99de9 + id: find-pull-request + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + branch: repo-sync + base: main + + - name: Close pull request if unwanted + if: ${{ github.repository == 'github/docs' && steps.find-pull-request.outputs.number }} + uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9 + with: + github-token: ${{ secrets.DOCUBOT_FR_PROJECT_BOARD_WORKFLOWS_REPO_ORG_READ_SCOPES }} + script: | + const { owner, repo } = context.repo + + const pr = await github.pulls.get({ + owner, + repo, + pull_number: parseInt(${{ steps.find-pull-request.outputs.number }}) + }) + + const prCreator = pr.user.login + + // If the PR creator is the expected account, stop now + if (prCreator === 'Octomerger') { + return + } + + try { + await github.teams.getMembershipForUserInOrg({ + org: 'github', + team_slug: 'employees', + username: prCreator + }) + + // If the PR creator is a GitHub employee, stop now + return + } catch (err) { + // An error will be thrown if the user is not a GitHub employee. + // That said, we still want to proceed anyway! + } + + // Close the PR and add the invalid label + await github.issues.update({ + owner, + repo, + issue_number: pr.number, + labels: ['invalid'], + state: 'closed' + }) + + // Comment on the PR + await github.issues.createComment({ + owner, + repo, + issue_number: pr.number, + body: "Please leave this `repo-sync` branch to the robots!\n\nI'm going to close this pull request now, but feel free to open a new issue or ask any questions in [discussions](https://github.com/github/docs/discussions)!" + }) + repo-sync: + needs: close-invalid-repo-sync if: github.repository == 'github/docs-internal' || github.repository == 'github/docs' name: Repo Sync runs-on: ubuntu-latest diff --git a/.github/workflows/send-prs-to-how-how-we-work-boards.yml b/.github/workflows/send-prs-to-how-how-we-work-boards.yml index b8ddf2c0b4..c1ab3934ee 100644 --- a/.github/workflows/send-prs-to-how-how-we-work-boards.yml +++ b/.github/workflows/send-prs-to-how-how-we-work-boards.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest continue-on-error: true steps: - - if: (github.repository == 'github/docs-internal' || github.repository == 'github/docs') && (contains(github.event.pull_request.labels.*.name, 'engineering') && contains(github.event.pull_request.labels.*.name, 'feature')) + - if: (github.repository == 'github/docs-internal' || github.repository == 'github/docs') && contains(github.event.pull_request.labels.*.name, 'feature') uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9 with: github-token: ${{ secrets.DOCUBOT_READORG_REPO_WORKFLOW_SCOPES }} @@ -35,11 +35,15 @@ jobs: var column_id = 13445681; try { - github.projects.createCard({ + await github.projects.createCard({ column_id: column_id, content_id: context.payload.pull_request.id, content_type: "PullRequest" }); } catch (error) { - console.log(error); + if (error.includes('Project already has the associated issue')) { + return + } else { + console.log(error); + } } diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index beb039ae6c..6a800b42ec 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,22 +17,7 @@ env: CI: true jobs: - see_if_should_skip: - continue-on-error: true - runs-on: ubuntu-latest - # Map a step output to a job output - outputs: - should_skip: ${{ steps.skip_check.outputs.should_skip }} - steps: - - id: skip_check - uses: fkirc/skip-duplicate-actions@36feb0d8d062137530c2e00bd278d138fe191289 - with: - cancel_others: 'false' - github_token: ${{ github.token }} - paths: '[".github/workflows/test.yml", ".node-version", ".npmrc", "app.json", "content/**", "data/**","lib/**", "Dockerfile", "feature-flags.json", "Gemfile", "Gemfile.lock", "middleware/**", "node_modules/**","package.json", "package-lock.json", "server.js", "tests/**", "translations/**", "Procfile", "webpack.config.js"]' - test: - needs: see_if_should_skip # Run on self-hosted if the private repo or ubuntu-latest if the public repo # See pull # 17442 in the private repo for context runs-on: ${{ fromJSON('["ubuntu-latest", "self-hosted"]')[github.repository == 'github/docs-internal'] }} @@ -44,27 +29,23 @@ jobs: steps: # Each of these ifs needs to be repeated at each step to make sure the required check still runs # Even if if doesn't do anything - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Check out repo + - name: Check out repo uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f with: # Enables cloning the Early Access repo later with the relevant PAT persist-credentials: 'false' - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Setup node + - name: Setup node uses: actions/setup-node@c46424eee26de4078d34105d3de3cc4992202b1e with: node-version: 14.x - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Get npm cache directory + - name: Get npm cache directory id: npm-cache run: | echo "::set-output name=dir::$(npm config get cache)" - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Cache node modules + - name: Cache node modules uses: actions/cache@0781355a23dac32fd3bac414512f4b903437991a with: path: ${{ steps.npm-cache.outputs.dir }} @@ -72,23 +53,21 @@ jobs: restore-keys: | ${{ runner.os }}-node- - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Install dependencies + - name: Install dependencies run: npm ci - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' && github.repository == 'github/docs-internal' }} + - if: ${{ github.repository == 'github/docs-internal' }} name: Clone early access run: npm run heroku-postbuild env: DOCUBOT_REPO_PAT: ${{ secrets.DOCUBOT_REPO_PAT }} GIT_BRANCH: ${{ github.head_ref || github.ref }} - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' && github.repository != 'github/docs-internal' }} + - if: ${{ github.repository != 'github/docs-internal' }} name: Run build script run: npm run build - - if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }} - name: Run tests + - name: Run tests run: npx jest tests/${{ matrix.test-group }}/ env: NODE_OPTIONS: '--max_old_space_size=4096' diff --git a/.pa11yci b/.pa11yci index 126bd542f4..0c0c506c8a 100644 --- a/.pa11yci +++ b/.pa11yci @@ -24,7 +24,7 @@ "http://localhost:4001/en/github/setting-up-and-managing-your-github-user-account/setting-your-commit-email-address", "http://localhost:4001/en/github/authenticating-to-github/configuring-two-factor-authentication", "http://localhost:4001/en/rest", - "http://localhost:4001/en/github/working-with-github-pages/configuring-a-custom-domain-for-your-github-pages-site", + "http://localhost:4001/en/pages/configuring-a-custom-domain-for-your-github-pages-site", "http://localhost:4001/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests", "http://localhost:4001/en/github/setting-up-and-managing-your-github-user-account/changing-your-primary-email-address", "http://localhost:4001/en/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile", @@ -36,17 +36,17 @@ "http://localhost:4001/en/github/authenticating-to-github/testing-your-ssh-connection", "http://localhost:4001/en/github/getting-started-with-github/fork-a-repo", "http://localhost:4001/en/graphql", - "http://localhost:4001/en/github/working-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site", + "http://localhost:4001/en/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site", "http://localhost:4001/en/developers", "http://localhost:4001/en/github/getting-started-with-github/supported-browsers", "http://localhost:4001/en/github/managing-your-work-on-github/about-project-boards", "http://localhost:4001/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork", - "http://localhost:4001/en/github/working-with-github-pages/creating-a-github-pages-site", + "http://localhost:4001/en/pages/getting-started-with-github-pages/creating-a-github-pages-site", "http://localhost:4001/en/github/authenticating-to-github/working-with-ssh-key-passphrases", "http://localhost:4001/en/github/authenticating-to-github", "http://localhost:4001/en/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages", - "http://localhost:4001/en/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site", - "http://localhost:4001/en/github/working-with-github-pages/about-github-pages", + "http://localhost:4001/en/pages/configuring-a-custom-domain-for-your-github-pages-site/managing-a-custom-domain-for-your-github-pages-site", + "http://localhost:4001/en/pages/getting-started-with-github-pages/about-github-pages", "http://localhost:4001/en/github/setting-up-and-managing-your-github-profile", "http://localhost:4001/en/actions/getting-started-with-github-actions/about-github-actions", "http://localhost:4001/en/github/getting-started-with-github", @@ -59,7 +59,7 @@ "http://localhost:4001/en/packages", "http://localhost:4001/en/actions/configuring-and-managing-workflows/configuring-a-workflow", "http://localhost:4001/en/github/authenticating-to-github/managing-commit-signature-verification", - "http://localhost:4001/en/github/setting-up-and-managing-organizations-and-teams/about-oauth-app-access-restrictions", + "http://localhost:4001/en/organizations/restricting-access-to-your-organizations-data/about-oauth-app-access-restrictions", "http://localhost:4001/en/github/managing-files-in-a-repository/adding-a-file-to-a-repository-using-the-command-line", "http://localhost:4001/en/github/getting-started-with-github/access-permissions-on-github", "http://localhost:4001/en/github/getting-started-with-github/githubs-products", @@ -75,7 +75,7 @@ "http://localhost:4001/en/github/setting-up-and-managing-your-github-user-account/inviting-collaborators-to-a-personal-repository", "http://localhost:4001/en/github/setting-up-and-managing-your-github-user-account/changing-your-github-username", "http://localhost:4001/en/github/getting-started-with-github/create-a-repo", - "http://localhost:4001/en/github/working-with-github-pages/getting-started-with-github-pages", + "http://localhost:4001/en/pages/getting-started-with-github-pages", "http://localhost:4001/en/github/administering-a-repository/deleting-a-repository", "http://localhost:4001/en/actions/configuring-and-managing-workflows/using-environment-variables", "http://localhost:4001/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets", @@ -86,7 +86,7 @@ "http://localhost:4001/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue", "http://localhost:4001/en/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates", "http://localhost:4001/en/github/authenticating-to-github/about-two-factor-authentication", - "http://localhost:4001/en/github/working-with-github-pages/about-custom-domains-and-github-pages", + "http://localhost:4001/en/pages/configuring-a-custom-domain-for-your-github-pages-site/about-custom-domains-and-github-pages", "http://localhost:4001/en/github/searching-for-information-on-github/searching-code", "http://localhost:4001/en/github/getting-started-with-github/configuring-git-to-handle-line-endings", "http://localhost:4001/en/github/getting-started-with-github/getting-changes-from-a-remote-repository", @@ -95,7 +95,7 @@ "http://localhost:4001/en/github/creating-cloning-and-archiving-repositories/licensing-a-repository", "http://localhost:4001/en/github/getting-started-with-github/verifying-your-email-address", "http://localhost:4001/en/github/setting-up-and-managing-your-github-profile/personalizing-your-profile", - "http://localhost:4001/en/github/working-with-github-pages/setting-up-a-github-pages-site-with-jekyll", + "http://localhost:4001/en/pages/setting-up-a-github-pages-site-with-jekyll", "http://localhost:4001/en/github/managing-subscriptions-and-notifications-on-github", "http://localhost:4001/en/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork" ] diff --git a/Dockerfile.openapi_decorator b/Dockerfile.openapi_decorator new file mode 100644 index 0000000000..a0e5a0c2e0 --- /dev/null +++ b/Dockerfile.openapi_decorator @@ -0,0 +1,19 @@ +FROM node:14-alpine + +RUN apk add --no-cache git python make g++ + +WORKDIR /openapi-check + +RUN chown node:node /openapi-check -R + +USER node + +COPY --chown=node:node package.json /openapi-check +COPY --chown=node:node package-lock.json /openapi-check +ADD --chown=node:node script /openapi-check/script +ADD --chown=node:node lib /openapi-check/lib +ADD --chown=node:node content /openapi-check/content + +RUN npm ci -D + +ENTRYPOINT ["node", "/openapi-check/script/rest/openapi-check.js"] diff --git a/app.json b/app.json index 913a41b28e..75a201a8b6 100644 --- a/app.json +++ b/app.json @@ -12,7 +12,7 @@ "formation": { "web": { "quantity": 1, - "size": "standard-1x" + "size": "standard-2x" } } } diff --git a/assets/images/enterprise/orgs-and-teams/edit-organization-settings.png b/assets/images/enterprise/orgs-and-teams/edit-organization-settings.png new file mode 100644 index 0000000000..8de8cc1898 Binary files /dev/null and b/assets/images/enterprise/orgs-and-teams/edit-organization-settings.png differ diff --git a/assets/images/enterprise/orgs-and-teams/jira/jira-applications.png b/assets/images/enterprise/orgs-and-teams/jira/jira-applications.png new file mode 100644 index 0000000000..3286309f18 Binary files /dev/null and b/assets/images/enterprise/orgs-and-teams/jira/jira-applications.png differ diff --git a/assets/images/enterprise/orgs-and-teams/jira/jira-integrations-dvcs.png b/assets/images/enterprise/orgs-and-teams/jira/jira-integrations-dvcs.png new file mode 100644 index 0000000000..b2f97f6461 Binary files /dev/null and b/assets/images/enterprise/orgs-and-teams/jira/jira-integrations-dvcs.png differ diff --git a/assets/images/enterprise/orgs-and-teams/jira/jira-link-github-account.png b/assets/images/enterprise/orgs-and-teams/jira/jira-link-github-account.png new file mode 100644 index 0000000000..e90ccfb025 Binary files /dev/null and b/assets/images/enterprise/orgs-and-teams/jira/jira-link-github-account.png differ diff --git a/assets/images/enterprise/orgs-and-teams/organization-dev-settings-oauth-apps.png b/assets/images/enterprise/orgs-and-teams/organization-dev-settings-oauth-apps.png new file mode 100644 index 0000000000..c57c6002ee Binary files /dev/null and b/assets/images/enterprise/orgs-and-teams/organization-dev-settings-oauth-apps.png differ diff --git a/assets/images/enterprise/orgs-and-teams/profile-select-organization.png b/assets/images/enterprise/orgs-and-teams/profile-select-organization.png new file mode 100644 index 0000000000..ba776a2f59 Binary files /dev/null and b/assets/images/enterprise/orgs-and-teams/profile-select-organization.png differ diff --git a/assets/images/enterprise/orgs-and-teams/register-oauth-application-button.png b/assets/images/enterprise/orgs-and-teams/register-oauth-application-button.png new file mode 100644 index 0000000000..9cf59d03dd Binary files /dev/null and b/assets/images/enterprise/orgs-and-teams/register-oauth-application-button.png differ diff --git a/assets/images/help/billing/confirm-sponsorship-cancellation.png b/assets/images/help/billing/confirm-sponsorship-cancellation.png index d8123dc2ac..0ae527d924 100644 Binary files a/assets/images/help/billing/confirm-sponsorship-cancellation.png and b/assets/images/help/billing/confirm-sponsorship-cancellation.png differ diff --git a/assets/images/help/pages/choose-a-theme.png b/assets/images/help/pages/choose-a-theme.png index e05a637b4e..aa5af54d24 100644 Binary files a/assets/images/help/pages/choose-a-theme.png and b/assets/images/help/pages/choose-a-theme.png differ diff --git a/assets/images/help/pages/click-private-pages-url-to-preview.png b/assets/images/help/pages/click-private-pages-url-to-preview.png index eb285a2fd0..6cac3856e6 100644 Binary files a/assets/images/help/pages/click-private-pages-url-to-preview.png and b/assets/images/help/pages/click-private-pages-url-to-preview.png differ diff --git a/assets/images/help/pages/enforce-https-custom-domains.png b/assets/images/help/pages/enforce-https-custom-domains.png index a397baf340..653520fe7a 100644 Binary files a/assets/images/help/pages/enforce-https-custom-domains.png and b/assets/images/help/pages/enforce-https-custom-domains.png differ diff --git a/assets/images/help/pages/pages-tab.png b/assets/images/help/pages/pages-tab.png new file mode 100644 index 0000000000..02a87abc5a Binary files /dev/null and b/assets/images/help/pages/pages-tab.png differ diff --git a/assets/images/help/pages/publishing-source-drop-down.png b/assets/images/help/pages/publishing-source-drop-down.png index 53d9dcfe29..91131ab650 100644 Binary files a/assets/images/help/pages/publishing-source-drop-down.png and b/assets/images/help/pages/publishing-source-drop-down.png differ diff --git a/assets/images/help/pages/remove-custom-domain.png b/assets/images/help/pages/remove-custom-domain.png new file mode 100644 index 0000000000..2b09f66fbd Binary files /dev/null and b/assets/images/help/pages/remove-custom-domain.png differ diff --git a/assets/images/help/pages/save-custom-apex-domain.png b/assets/images/help/pages/save-custom-apex-domain.png index cf5d7cf090..d41cddbddd 100644 Binary files a/assets/images/help/pages/save-custom-apex-domain.png and b/assets/images/help/pages/save-custom-apex-domain.png differ diff --git a/assets/images/help/pages/save-custom-subdomain.png b/assets/images/help/pages/save-custom-subdomain.png index 24a248d980..01f6d6d926 100644 Binary files a/assets/images/help/pages/save-custom-subdomain.png and b/assets/images/help/pages/save-custom-subdomain.png differ diff --git a/assets/images/help/releases/create-release-discussion.png b/assets/images/help/releases/create-release-discussion.png new file mode 100644 index 0000000000..b8573c85c0 Binary files /dev/null and b/assets/images/help/releases/create-release-discussion.png differ diff --git a/assets/images/help/releases/prerelease_checkbox.png b/assets/images/help/releases/prerelease_checkbox.png index 46fde87d85..22a3958315 100644 Binary files a/assets/images/help/releases/prerelease_checkbox.png and b/assets/images/help/releases/prerelease_checkbox.png differ diff --git a/assets/images/help/releases/update-release.png b/assets/images/help/releases/update-release.png index 827441d9cf..42383c045a 100644 Binary files a/assets/images/help/releases/update-release.png and b/assets/images/help/releases/update-release.png differ diff --git a/assets/images/help/repository/actions-quickstart-commit-new-file.png b/assets/images/help/repository/actions-quickstart-commit-new-file.png new file mode 100644 index 0000000000..7d1df5a5c2 Binary files /dev/null and b/assets/images/help/repository/actions-quickstart-commit-new-file.png differ diff --git a/assets/images/help/repository/actions-quickstart-job.png b/assets/images/help/repository/actions-quickstart-job.png new file mode 100644 index 0000000000..93fa19fca6 Binary files /dev/null and b/assets/images/help/repository/actions-quickstart-job.png differ diff --git a/assets/images/help/repository/actions-quickstart-log-detail.png b/assets/images/help/repository/actions-quickstart-log-detail.png new file mode 100644 index 0000000000..05ff4b0ba4 Binary files /dev/null and b/assets/images/help/repository/actions-quickstart-log-detail.png differ diff --git a/assets/images/help/repository/actions-quickstart-logs.png b/assets/images/help/repository/actions-quickstart-logs.png new file mode 100644 index 0000000000..e7a0efcbd7 Binary files /dev/null and b/assets/images/help/repository/actions-quickstart-logs.png differ diff --git a/assets/images/help/repository/actions-quickstart-run-name.png b/assets/images/help/repository/actions-quickstart-run-name.png new file mode 100644 index 0000000000..d6398fa640 Binary files /dev/null and b/assets/images/help/repository/actions-quickstart-run-name.png differ diff --git a/assets/images/help/repository/actions-quickstart-workflow-sidebar.png b/assets/images/help/repository/actions-quickstart-workflow-sidebar.png new file mode 100644 index 0000000000..2221c58c98 Binary files /dev/null and b/assets/images/help/repository/actions-quickstart-workflow-sidebar.png differ diff --git a/assets/images/help/settings/settings-sidebar-billing-plans.png b/assets/images/help/settings/settings-sidebar-billing-plans.png new file mode 100644 index 0000000000..015902a30b Binary files /dev/null and b/assets/images/help/settings/settings-sidebar-billing-plans.png differ diff --git a/assets/images/help/sponsors/add-a-tier-button.png b/assets/images/help/sponsors/add-a-tier-button.png index fef5798c32..df5a2e41a9 100644 Binary files a/assets/images/help/sponsors/add-a-tier-button.png and b/assets/images/help/sponsors/add-a-tier-button.png differ diff --git a/assets/images/help/sponsors/enable-custom-amounts.png b/assets/images/help/sponsors/enable-custom-amounts.png new file mode 100644 index 0000000000..8c0de05d9e Binary files /dev/null and b/assets/images/help/sponsors/enable-custom-amounts.png differ diff --git a/assets/images/help/sponsors/filter-drop-down.png b/assets/images/help/sponsors/filter-drop-down.png index 4128bc4f69..61522d8b72 100644 Binary files a/assets/images/help/sponsors/filter-drop-down.png and b/assets/images/help/sponsors/filter-drop-down.png differ diff --git a/assets/images/help/sponsors/pay-prorated-amount-link.png b/assets/images/help/sponsors/pay-prorated-amount-link.png index 46683831ad..882a677a15 100644 Binary files a/assets/images/help/sponsors/pay-prorated-amount-link.png and b/assets/images/help/sponsors/pay-prorated-amount-link.png differ diff --git a/assets/images/help/sponsors/publish-tier-button.png b/assets/images/help/sponsors/publish-tier-button.png index c52eb02e22..d87155ed79 100644 Binary files a/assets/images/help/sponsors/publish-tier-button.png and b/assets/images/help/sponsors/publish-tier-button.png differ diff --git a/assets/images/help/sponsors/save-tier-draft.png b/assets/images/help/sponsors/save-tier-draft.png index a008decdc1..9469f3c1a6 100644 Binary files a/assets/images/help/sponsors/save-tier-draft.png and b/assets/images/help/sponsors/save-tier-draft.png differ diff --git a/assets/images/help/sponsors/select-a-tier-box.png b/assets/images/help/sponsors/select-a-tier-box.png index cbdad0a4f0..7337ae1c64 100644 Binary files a/assets/images/help/sponsors/select-a-tier-box.png and b/assets/images/help/sponsors/select-a-tier-box.png differ diff --git a/assets/images/help/sponsors/set-default-amount.png b/assets/images/help/sponsors/set-default-amount.png new file mode 100644 index 0000000000..6f05d09dc5 Binary files /dev/null and b/assets/images/help/sponsors/set-default-amount.png differ diff --git a/assets/images/help/sponsors/show-one-time-tiers.png b/assets/images/help/sponsors/show-one-time-tiers.png new file mode 100644 index 0000000000..6a4ce0c3e5 Binary files /dev/null and b/assets/images/help/sponsors/show-one-time-tiers.png differ diff --git a/assets/images/help/sponsors/sponsor-developer-button.png b/assets/images/help/sponsors/sponsor-developer-button.png index 07ff04b8c3..e44f53529a 100644 Binary files a/assets/images/help/sponsors/sponsor-developer-button.png and b/assets/images/help/sponsors/sponsor-developer-button.png differ diff --git a/assets/images/help/sponsors/tier-price-description.png b/assets/images/help/sponsors/tier-price-description.png index 6c8dcc929c..74310b682d 100644 Binary files a/assets/images/help/sponsors/tier-price-description.png and b/assets/images/help/sponsors/tier-price-description.png differ diff --git a/assets/images/help/sponsors/update-sponsorship-button.png b/assets/images/help/sponsors/update-sponsorship-button.png index 3e73ca622f..c4d7f82a31 100644 Binary files a/assets/images/help/sponsors/update-sponsorship-button.png and b/assets/images/help/sponsors/update-sponsorship-button.png differ diff --git a/assets/images/help/sponsors/updates-checkbox-manage.png b/assets/images/help/sponsors/updates-checkbox-manage.png index 42f509ba4c..c0e919374d 100644 Binary files a/assets/images/help/sponsors/updates-checkbox-manage.png and b/assets/images/help/sponsors/updates-checkbox-manage.png differ diff --git a/assets/images/help/sponsors/who-can-see-sponsorship.png b/assets/images/help/sponsors/who-can-see-sponsorship.png index 6caf98886d..aac8a4df94 100644 Binary files a/assets/images/help/sponsors/who-can-see-sponsorship.png and b/assets/images/help/sponsors/who-can-see-sponsorship.png differ diff --git a/content/README.md b/content/README.md index 45b571c323..ca4ad5debd 100644 --- a/content/README.md +++ b/content/README.md @@ -184,8 +184,10 @@ featuredLinks: ### `changelog` -- Purpose: Render a list of changelog items with timestamps on product pages (ex: `layouts/product-landing.html`) -- Type: `Array`, items are objects `{ href: string, title: string, date: 'YYYY-MM-DD' }` +- Purpose: Render a list of items pulled from [GitHub Changelog](https://github.blog/changelog/) on product landing pages (ex: `layouts/product-landing.html`). The one exception is Education, which pulls from https://github.blog/category/community/education. +- Type: `Object`, properties: + - `label` -- must be present and corresponds to the labels used in the [GitHub Changelog](https://github.blog/changelog/) + - `prefix` -- optional string that starts each changelog title that should be omitted in the docs feed. For example, with the prefix `GitHub Actions: ` specified, changelog titles like `GitHub Actions: Some Title Here` will render as `Some Title Here` in the docs feed). - Optional. ### `defaultPlatform` @@ -223,7 +225,7 @@ includeGuides: ``` ### `type` -- Purpose: Indicate the type of article. +- Purpose: Indicate the type of article. - Type: `String`, one of the `overview`, `quick_start`, `tutorial`, `how_to`, `reference`. - Optional. diff --git a/content/actions/guides/building-and-testing-java-with-ant.md b/content/actions/guides/building-and-testing-java-with-ant.md index e118039190..9c59bc86fe 100644 --- a/content/actions/guides/building-and-testing-java-with-ant.md +++ b/content/actions/guides/building-and-testing-java-with-ant.md @@ -58,10 +58,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adopt' - name: Build with Ant run: ant -noinput -buildfile build.xml ``` @@ -70,7 +71,7 @@ jobs: This workflow performs the following steps: 1. The `checkout` step downloads a copy of your repository on the runner. -2. The `setup-java` step configures the Java 1.8 JDK. +2. The `setup-java` step configures the Java 11 JDK by Adoptium. 3. The "Build with Ant" step runs the default target in your `build.xml` in non-interactive mode. The default workflow templates are excellent starting points when creating your build and test workflow, and you can customize the template to suit your project’s needs. @@ -91,9 +92,10 @@ If you use different commands to build your project, or you want to run a differ ```yaml{:copy} steps: - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adopt' - name: Run the Ant jar target run: ant -noinput -buildfile build-ci.xml jar ``` @@ -109,7 +111,11 @@ Ant will usually create output files like JARs, EARs, or WARs in the `build/jar` ```yaml{:copy} steps: - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + - run: ant -noinput -buildfile build.xml - uses: actions/upload-artifact@v2 with: diff --git a/content/actions/guides/building-and-testing-java-with-gradle.md b/content/actions/guides/building-and-testing-java-with-gradle.md index 38ca522caf..c089e30995 100644 --- a/content/actions/guides/building-and-testing-java-with-gradle.md +++ b/content/actions/guides/building-and-testing-java-with-gradle.md @@ -58,10 +58,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adopt' - name: Build with Gradle run: ./gradlew build ``` @@ -70,7 +71,7 @@ jobs: This workflow performs the following steps: 1. The `checkout` step downloads a copy of your repository on the runner. -2. The `setup-java` step configures the Java 1.8 JDK. +2. The `setup-java` step configures the Java 11 JDK by Adoptium. 3. The "Build with Gradle" step runs the `gradlew` wrapper script to ensure that your code builds, tests pass, and a package can be created. The default workflow templates are excellent starting points when creating your build and test workflow, and you can customize the template to suit your project’s needs. @@ -91,9 +92,10 @@ If you use different commands to build your project, or you want to use a differ ```yaml{:copy} steps: - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adopt' - name: Run the Gradle package task run: ./gradlew -b ci.gradle package ``` @@ -107,10 +109,11 @@ When using {% data variables.product.prodname_dotcom %}-hosted runners, you can ```yaml{:copy} steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adopt' - name: Cache Gradle packages uses: actions/cache@v2 with: @@ -143,7 +146,11 @@ Gradle will usually create output files like JARs, EARs, or WARs in the `build/l ```yaml{:copy} steps: - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + - run: ./gradlew build - uses: actions/upload-artifact@v2 with: diff --git a/content/actions/guides/building-and-testing-java-with-maven.md b/content/actions/guides/building-and-testing-java-with-maven.md index 483caa962f..f282278baf 100644 --- a/content/actions/guides/building-and-testing-java-with-maven.md +++ b/content/actions/guides/building-and-testing-java-with-maven.md @@ -58,10 +58,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adopt' - name: Build with Maven run: mvn --batch-mode --update-snapshots verify ``` @@ -70,7 +71,7 @@ jobs: This workflow performs the following steps: 1. The `checkout` step downloads a copy of your repository on the runner. -2. The `setup-java` step configures the Java 1.8 JDK. +2. The `setup-java` step configures the Java 11 JDK by Adoptium. 3. The "Build with Maven" step runs the Maven `package` target in non-interactive mode to ensure that your code builds, tests pass, and a package can be created. The default workflow templates are excellent starting points when creating your build and test workflow, and you can customize the template to suit your project’s needs. @@ -91,9 +92,10 @@ If you use different commands to build your project, or you want to use a differ ```yaml{:copy} steps: - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adopt' - name: Run the Maven verify phase run: mvn --batch-mode --update-snapshots verify ``` @@ -107,10 +109,11 @@ When using {% data variables.product.prodname_dotcom %}-hosted runners, you can ```yaml{:copy} steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adopt' - name: Cache Maven packages uses: actions/cache@v2 with: @@ -134,7 +137,10 @@ Maven will usually create output files like JARs, EARs, or WARs in the `target` ```yaml{:copy} steps: - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' - run: mvn --batch-mode --update-snapshots verify - run: mkdir staging && cp target/*.jar staging - uses: actions/upload-artifact@v2 diff --git a/content/actions/guides/publishing-java-packages-with-gradle.md b/content/actions/guides/publishing-java-packages-with-gradle.md index b9901a18d7..6a7f10ecd5 100644 --- a/content/actions/guides/publishing-java-packages-with-gradle.md +++ b/content/actions/guides/publishing-java-packages-with-gradle.md @@ -85,9 +85,10 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adopt' - name: Publish package run: gradle publish env: @@ -143,9 +144,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adopt' - name: Publish package run: gradle publish env: @@ -209,9 +211,10 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adopt' - name: Publish to the Maven Central Repository run: gradle publish env: diff --git a/content/actions/guides/publishing-java-packages-with-maven.md b/content/actions/guides/publishing-java-packages-with-maven.md index 507f4cc9af..d9fad33466 100644 --- a/content/actions/guides/publishing-java-packages-with-maven.md +++ b/content/actions/guides/publishing-java-packages-with-maven.md @@ -85,9 +85,10 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Maven Central Repository - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adopt' server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD @@ -147,9 +148,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adopt' - name: Publish package run: mvn --batch-mode deploy env: @@ -183,9 +185,10 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Java for publishing to Maven Central Repository - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adopt' server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD @@ -195,9 +198,10 @@ jobs: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} - name: Set up Java for publishing to GitHub Packages - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: '11' + distribution: 'adopt' - name: Publish to GitHub Packages run: mvn --batch-mode deploy env: diff --git a/content/actions/hosting-your-own-runners/about-self-hosted-runners.md b/content/actions/hosting-your-own-runners/about-self-hosted-runners.md index 1c76fa56cf..7a3c715b25 100644 --- a/content/actions/hosting-your-own-runners/about-self-hosted-runners.md +++ b/content/actions/hosting-your-own-runners/about-self-hosted-runners.md @@ -123,7 +123,7 @@ The self-hosted runner polls {% data variables.product.product_name %} to retrie You must ensure that the self-hosted runner has appropriate network access to communicate with the {% data variables.product.prodname_ghe_managed %} URL. For example, if your instance name is `octoghae`, then you will need to allow the self-hosted runner to access `octoghae.github.com`. -If you use an IP address allow list for your {% data variables.product.prodname_dotcom %} organization or enterprise account, you must add your self-hosted runner's IP address to the allow list. For more information, see "[Managing allowed IP addresses for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization#using-github-actions-with-an-ip-allow-list)." +If you use an IP address allow list for your {% data variables.product.prodname_dotcom %} organization or enterprise account, you must add your self-hosted runner's IP address to the allow list. For more information, see "[Managing allowed IP addresses for your organization](/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization#using-github-actions-with-an-ip-allow-list)." {% endif %} {% if currentVersion == "free-pro-team@latest" %} @@ -143,7 +143,7 @@ pkg-containers.githubusercontent.com pkg-containers-az.githubusercontent.com ``` -If you use an IP address allow list for your {% data variables.product.prodname_dotcom %} organization or enterprise account, you must add your self-hosted runner's IP address to the allow list. For more information, see "[Managing allowed IP addresses for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization#using-github-actions-with-an-ip-allow-list)" or "[Enforcing security settings in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account#using-github-actions-with-an-ip-allow-list)". +If you use an IP address allow list for your {% data variables.product.prodname_dotcom %} organization or enterprise account, you must add your self-hosted runner's IP address to the allow list. For more information, see "[Managing allowed IP addresses for your organization](/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization#using-github-actions-with-an-ip-allow-list)" or "[Enforcing security settings in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account#using-github-actions-with-an-ip-allow-list)". {% else %} diff --git a/content/actions/index.md b/content/actions/index.md index 48ff80ce2c..d32dfec985 100644 --- a/content/actions/index.md +++ b/content/actions/index.md @@ -22,18 +22,9 @@ featuredLinks: - /actions/reference/environment-variables - /actions/reference/encrypted-secrets changelog: - - title: Environments, environment protection rules and environment secrets (beta) - date: '2020-12-15' - href: https://github.blog/changelog/2020-12-15-github-actions-environments-environment-protection-rules-and-environment-secrets-beta/ - - title: Workflow visualization - date: '2020-12-08' - href: https://github.blog/changelog/2020-12-08-github-actions-workflow-visualization/ - - title: Removing set-env and add-path commands on November 16 - date: '2020-11-09' - href: https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/ - + label: 'actions' + prefix: 'GitHub Actions: ' product_video: https://www.youtube-nocookie.com/embed/cP0I9w2coGU - redirect_from: - /articles/automating-your-workflow-with-github-actions/ - /articles/customizing-your-project-with-github-actions/ diff --git a/content/actions/learn-github-actions/security-hardening-for-github-actions.md b/content/actions/learn-github-actions/security-hardening-for-github-actions.md index 9e6ea648c4..c35f549564 100644 --- a/content/actions/learn-github-actions/security-hardening-for-github-actions.md +++ b/content/actions/learn-github-actions/security-hardening-for-github-actions.md @@ -121,7 +121,7 @@ For example, you can use the audit log to track the `org.update_actions_secret` ![Audit log entries](/assets/images/help/repository/audit-log-entries.png) The following tables describe the {% data variables.product.prodname_actions %} events that you can find in the audit log. For more information on using the audit log, see -"[Reviewing the audit log for your organization](/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization#searching-the-audit-log)." +"[Reviewing the audit log for your organization](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization#searching-the-audit-log)." {% if currentVersion == "free-pro-team@latest" %} #### Events for environments @@ -157,7 +157,7 @@ The following tables describe the {% data variables.product.prodname_actions %} | `enterprise.register_self_hosted_runner` | Triggered when a new self-hosted runner is registered. For more information, see "[Adding a self-hosted runner to an enterprise](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-an-enterprise)." | `enterprise.remove_self_hosted_runner` | Triggered when a self-hosted runner is removed. | `enterprise.runner_group_runners_updated` | Triggered when a runner group's list of members is updated. For more information, see "[Set self-hosted runners in a group for an organization](/rest/reference/actions#set-self-hosted-runners-in-a-group-for-an-organization)." -| `enterprise.self_hosted_runner_updated` | Triggered when the runner application is updated. Can be viewed using the REST API and the UI. This event is not included when you export the audit log as JSON data or a CSV file. For more information, see "[About self-hosted runners](/actions/hosting-your-own-runners/about-self-hosted-runners#about-self-hosted-runners)" and "[Reviewing the audit log for your organization](/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization#exporting-the-audit-log)."{% endif %} +| `enterprise.self_hosted_runner_updated` | Triggered when the runner application is updated. Can be viewed using the REST API and the UI. This event is not included when you export the audit log as JSON data or a CSV file. For more information, see "[About self-hosted runners](/actions/hosting-your-own-runners/about-self-hosted-runners#about-self-hosted-runners)" and "[Reviewing the audit log for your organization](/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization#exporting-the-audit-log)."{% endif %} | `org.register_self_hosted_runner` | Triggered when a new self-hosted runner is registered. For more information, see "[Adding a self-hosted runner to an organization](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-an-organization)." | `org.remove_self_hosted_runner` | Triggered when a self-hosted runner is removed. For more information, see [Removing a runner from an organization](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-an-organization). | `org.runner_group_runners_updated` | Triggered when a runner group's list of members is updated. For more information, see "[Set self-hosted runners in a group for an organization](/rest/reference/actions#set-self-hosted-runners-in-a-group-for-an-organization)." diff --git a/content/actions/quickstart.md b/content/actions/quickstart.md index fa57cf9deb..cb424476cc 100644 --- a/content/actions/quickstart.md +++ b/content/actions/quickstart.md @@ -1,6 +1,6 @@ --- title: Quickstart for GitHub Actions -intro: 'Add a {% data variables.product.prodname_actions %} workflow to an existing repository in 5 minutes or less.' +intro: 'Try out the features of {% data variables.product.prodname_actions %} in 5 minutes or less.' allowTitleToDifferFromFilename: true redirect_from: - /actions/getting-started-with-github-actions/starting-with-preconfigured-workflow-templates @@ -19,135 +19,73 @@ topics: ### Introduction -You only need an existing {% data variables.product.prodname_dotcom %} repository to create and run a {% data variables.product.prodname_actions %} workflow. In this guide, you'll add a workflow that lints multiple coding languages using the [{% data variables.product.prodname_dotcom %} Super-Linter action](https://github.com/github/super-linter). The workflow uses Super-Linter to validate your source code every time a new commit is pushed to your repository. +You only need a {% data variables.product.prodname_dotcom %} repository to create and run a {% data variables.product.prodname_actions %} workflow. In this guide, you'll add a workflow that demonstrates some of the essential features of {% data variables.product.prodname_actions %}. + +The following example shows you how {% data variables.product.prodname_actions %} jobs can be automatically triggered, where they run, and how they can interact with the code in your repository. ### Creating your first workflow -1. From your repository on {% data variables.product.prodname_dotcom %}, create a new file in the `.github/workflows` directory named `superlinter.yml`. For more information, see "[Creating new files](/github/managing-files-in-a-repository/creating-new-files)." -2. Copy the following YAML contents into the `superlinter.yml` file. **Note:** If your default branch is not `main`, update the value of `DEFAULT_BRANCH` to match your repository's default branch name. +1. From your repository on {% data variables.product.prodname_dotcom %}, create a new file in the `.github/workflows` directory named `github-actions-demo.yml`. For more information, see "[Creating new files](/github/managing-files-in-a-repository/creating-new-files)." +2. Copy the following YAML contents into the `github-actions-demo.yml` file: {% raw %} ```yaml{:copy} - name: Super-Linter - - # Run this workflow every time a new commit pushed to your repository - on: push - + name: GitHub Actions Demo + on: [push] jobs: - # Set the job key. The key is displayed as the job name - # when a job name is not provided - super-lint: - # Name the Job - name: Lint code base - # Set the type of machine to run on + Explore-GitHub-Actions: runs-on: ubuntu-latest - steps: - # Checks out a copy of your repository on the ubuntu-latest machine - - name: Checkout code + - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event." + - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!" + - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." + - name: Check out repository code uses: actions/checkout@v2 + - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner." + - run: echo "🖥️ The workflow is now ready to test your code on the runner." + - name: List files in the repository + run: | + ls ${{ github.workspace }} + - run: echo "🍏 This job's status is ${{ job.status }}." - # Runs the Super-Linter action - - name: Run Super-Linter - uses: github/super-linter@v3 - env: - DEFAULT_BRANCH: main - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ``` {% endraw %} -3. To run your workflow, scroll to the bottom of the page and select **Create a new branch for this commit and start a pull request**. Then, to create a pull request, click **Propose new file**. - ![Commit workflow file](/assets/images/commit-workflow-file.png) +3. Scroll to the bottom of the page and select **Create a new branch for this commit and start a pull request**. Then, to create a pull request, click **Propose new file**. + ![Commit workflow file](/assets/images/help/repository/actions-quickstart-commit-new-file.png) -Committing the workflow file in your repository triggers the `push` event and runs your workflow. +Committing the workflow file to a branch in your repository triggers the `push` event and runs your workflow. ### Viewing your workflow results {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.actions-tab %} -{% data reusables.repositories.navigate-to-workflow-superlinter %} -{% data reusables.repositories.view-run-superlinter %} -{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" or currentVersion == "github-ae@latest" %} -1. Under **Jobs** or in the visualization graph, click the **Lint code base** job. - ![Lint code base job](/assets/images/help/repository/superlinter-lint-code-base-job-updated.png) -{% else %} -1. In the left sidebar, click the **Lint code base** job. - ![Lint code base job](/assets/images/help/repository/superlinter-lint-code-base-job.png) -{% endif %} -{% data reusables.repositories.view-failed-job-results-superlinter %} +1. In the left sidebar, click the workflow you want to see. + ![Workflow list in left sidebar](/assets/images/help/repository/actions-quickstart-workflow-sidebar.png) +1. From the list of workflow runs, click the name of the run you want to see. + + ![Name of workflow run](/assets/images/help/repository/actions-quickstart-run-name.png) +1. Under **Jobs** , click the **Explore-GitHub-Actions** job. + + ![Locate job](/assets/images/help/repository/actions-quickstart-job.png) +1. The log shows you how each of the steps was processed. Expand any of the steps to view its details. + + ![Example workflow results](/assets/images/help/repository/actions-quickstart-logs.png) + + For example, you can see the list of files in your repository: + ![Example action detail](/assets/images/help/repository/actions-quickstart-log-detail.png) + ### More workflow templates {% data reusables.actions.workflow-template-overview %} ### Next steps -The super-linter workflow you just added runs each time code is pushed to your repository to help you spot errors and inconsistencies in your code. But this is only the beginning of what you can do with {% data variables.product.prodname_actions %}. Your repository can contain multiple workflows that trigger different jobs based on different events. {% data variables.product.prodname_actions %} can help you automate nearly every aspect of your application development processes. Ready to get started? Here are some helpful resources for taking your next steps with {% data variables.product.prodname_actions %}: +The example workflow you just added runs each time code is pushed to the branch, and shows you how {% data variables.product.prodname_actions %} can work with the contents of your repository. But this is only the beginning of what you can do with {% data variables.product.prodname_actions %}: -- "[Learn {% data variables.product.prodname_actions %}](/actions/learn-github-actions)" for an in-depth tutorial -- "[Guides](/actions/guides)" for specific uses cases and examples -- [github/super-linter](https://github.com/github/super-linter) for more details about configuring the Super-Linter action +- Your repository can contain multiple workflows that trigger different jobs based on different events. +- You can use a workflow to install software testing apps and have them automatically test your code on {% data variables.product.prodname_dotcom %}'s runners. - +- "[Learn {% data variables.product.prodname_actions %}](/actions/learn-github-actions)" for an in-depth tutorial. +- "[Guides](/actions/guides)" for specific uses cases and examples. diff --git a/content/actions/reference/usage-limits-billing-and-administration.md b/content/actions/reference/usage-limits-billing-and-administration.md index 2ab089a0ed..ef87f6ebc6 100644 --- a/content/actions/reference/usage-limits-billing-and-administration.md +++ b/content/actions/reference/usage-limits-billing-and-administration.md @@ -67,7 +67,7 @@ You can configure the artifact and log retention period for your repository, org For more information, see: - [Configuring the retention period for {% data variables.product.prodname_actions %} for artifacts and logs in your repository](/github/administering-a-repository/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-repository) -- [Configuring the retention period for {% data variables.product.prodname_actions %} for artifacts and logs in your organization](/github/setting-up-and-managing-organizations-and-teams/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization) +- [Configuring the retention period for {% data variables.product.prodname_actions %} for artifacts and logs in your organization](/organizations/managing-organization-settings/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization) - [Configuring the retention period for {% data variables.product.prodname_actions %} for artifacts and logs in your enterprise](/github/setting-up-and-managing-your-enterprise/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-enterprise-account) {% endif %} @@ -77,7 +77,7 @@ For more information, see: For more information, see: - "[Disabling or limiting {% data variables.product.prodname_actions %} for a repository](/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository)" -- "[Disabling or limiting {% data variables.product.prodname_actions %} for your organization](/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization)"{% if currentVersion == "free-pro-team@latest" %} +- "[Disabling or limiting {% data variables.product.prodname_actions %} for your organization](/organizations/managing-organization-settings/disabling-or-limiting-github-actions-for-your-organization)"{% if currentVersion == "free-pro-team@latest" %} - "[Enforcing {% data variables.product.prodname_actions %} policies in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account)" for {% data variables.product.prodname_ghe_cloud %}{% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %} diff --git a/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md b/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md index a4c0796611..043e79414a 100644 --- a/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md +++ b/content/admin/authentication/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad.md @@ -21,7 +21,7 @@ After you enable SAML SSO and SCIM for {% data variables.product.prodname_ghe_ma * Assign the {% data variables.product.prodname_ghe_managed %} application to an IdP group on Azure AD to automatically create and grant access to user accounts on {% data variables.product.product_name %} for all members of the IdP group. In addition, the IdP group is available on {% data variables.product.prodname_ghe_managed %} for connection to a team and its parent organization. * Unassign the {% data variables.product.prodname_ghe_managed %} application from an IdP group to deactivate the {% data variables.product.product_name %} user accounts of all IdP users who had access only through that IdP group and remove the users from the parent organization. The IdP group will be disconnected from any teams on {% data variables.product.product_name %}. -For more information about managing identity and access for your enterprise on {% data variables.product.product_location %}, see "[Managing identity and access for your enterprise](/admin/authentication/managing-identity-and-access-for-your-enterprise)." For more information about synchronizing teams with IdP groups, see "[Synchronizing a team with an identity provider group](/github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group)." +For more information about managing identity and access for your enterprise on {% data variables.product.product_location %}, see "[Managing identity and access for your enterprise](/admin/authentication/managing-identity-and-access-for-your-enterprise)." For more information about synchronizing teams with IdP groups, see "[Synchronizing a team with an identity provider group](/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group)." ### Prerequisites diff --git a/content/admin/authentication/configuring-user-provisioning-for-your-enterprise.md b/content/admin/authentication/configuring-user-provisioning-for-your-enterprise.md index a0bd008285..6e936006e1 100644 --- a/content/admin/authentication/configuring-user-provisioning-for-your-enterprise.md +++ b/content/admin/authentication/configuring-user-provisioning-for-your-enterprise.md @@ -28,7 +28,7 @@ The provisioning application on your IdP communicates with {% data variables.pro {% data reusables.scim.supported-idps %} -When you set up user provisioning with a supported IdP, you can also assign or unassign the application for {% data variables.product.product_name %} to groups of users. These groups are then available to organization owners and team maintainers in {% data variables.product.product_location %} to map to {% data variables.product.product_name %} teams. For more information, see "[Synchronizing a team with an identity provider group](/github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group)." +When you set up user provisioning with a supported IdP, you can also assign or unassign the application for {% data variables.product.product_name %} to groups of users. These groups are then available to organization owners and team maintainers in {% data variables.product.product_location %} to map to {% data variables.product.product_name %} teams. For more information, see "[Synchronizing a team with an identity provider group](/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group)." ### Prerequisites diff --git a/content/admin/configuration/restricting-network-traffic-to-your-enterprise.md b/content/admin/configuration/restricting-network-traffic-to-your-enterprise.md index 7edc128771..fb9bf6d64d 100644 --- a/content/admin/configuration/restricting-network-traffic-to-your-enterprise.md +++ b/content/admin/configuration/restricting-network-traffic-to-your-enterprise.md @@ -13,7 +13,7 @@ By default, authorized users can access your enterprise from any IP address. Ent {% data reusables.identity-and-permissions.ip-allow-lists-enable %} -You can also configure allowed IP addresses for an individual organization. For more information, see "[Managing allowed IP addresses for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization)." +You can also configure allowed IP addresses for an individual organization. For more information, see "[Managing allowed IP addresses for your organization](/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization)." By default, Azure network security group (NSG) rules leave all inbound traffic open on ports 22, 80, 443, and 25. Enterprise owners can contact {% data variables.contact.github_support %} to configure access restrictions for your instance. diff --git a/content/admin/enterprise-support/about-github-premium-support-for-github-enterprise-server.md b/content/admin/enterprise-support/about-github-premium-support-for-github-enterprise-server.md index de2131bec7..87ed260dce 100644 --- a/content/admin/enterprise-support/about-github-premium-support-for-github-enterprise-server.md +++ b/content/admin/enterprise-support/about-github-premium-support-for-github-enterprise-server.md @@ -37,7 +37,7 @@ In addition to all of the benefits of {% data variables.contact.enterprise_suppo {% data reusables.support.signing-up-for-premium-support %} -{% data reusables.support.scope-of-support %} For more information, see "[Reaching {% data variables.product.prodname_ghe_server %} Support](/enterprise/admin/guides/enterprise-support/reaching-github-support)." +{% data reusables.support.scope-of-support %} {% data reusables.support.contacting-premium-support %} diff --git a/content/admin/enterprise-support/about-github-premium-support-for-github-enterprise.md b/content/admin/enterprise-support/about-github-premium-support-for-github-enterprise.md index 8553ddf3da..8c7b7a21ce 100644 --- a/content/admin/enterprise-support/about-github-premium-support-for-github-enterprise.md +++ b/content/admin/enterprise-support/about-github-premium-support-for-github-enterprise.md @@ -35,7 +35,7 @@ In addition to all of the benefits of {% data variables.contact.enterprise_suppo {% data reusables.support.signing-up-for-premium-support %} -{% data reusables.support.scope-of-support %} For more information, see "[Reaching {% data variables.product.prodname_ghe_server %} Support](/enterprise/admin/guides/enterprise-support/reaching-github-support)." +{% data reusables.support.scope-of-support %} {% data reusables.support.contacting-premium-support %} diff --git a/content/admin/github-actions/manually-syncing-actions-from-githubcom.md b/content/admin/github-actions/manually-syncing-actions-from-githubcom.md index 3f8f07e6ba..8e5a13fe7d 100644 --- a/content/admin/github-actions/manually-syncing-actions-from-githubcom.md +++ b/content/admin/github-actions/manually-syncing-actions-from-githubcom.md @@ -28,8 +28,21 @@ The `actions-sync` tool can only download actions from {% data variables.product ### Prerequisites -* Before using the `actions-sync` tool, you must ensure that all destination organizations already exist on your enterprise instance. The following example demonstrates how to sync actions to an organization named `synced-actions` on an enterprise instance. For more information, see "[Creating a new organization from scratch](/github/setting-up-and-managing-organizations-and-teams/creating-a-new-organization-from-scratch)." +* Before using the `actions-sync` tool, you must ensure that all destination organizations already exist on your enterprise instance. The following example demonstrates how to sync actions to an organization named `synced-actions` on an enterprise instance. For more information, see "[Creating a new organization from scratch](/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch)." * You must create a personal access token (PAT) on your enterprise instance that can create and write to repositories in the destination organizations. For more information, see "[Creating a personal access token](/github/authenticating-to-github/creating-a-personal-access-token)." +* If you want to sync the bundled actions in the `actions` organization on {% data variables.product.product_location %}, you must be an owner of the `actions` organization. + + {% note %} + + **Note:** By default, even site administrators are not owners of the bundled `actions` organization. + + {% endnote %} + + Site administrators can use the `ghe-org-admin-promote` command in the administrative shell to promote a user to be an owner of the bundled `actions` organization. For more information, see "[Accessing the administrative shell (SSH)](/admin/configuration/accessing-the-administrative-shell-ssh)" and "[`ghe-org-admin-promote`](/admin/configuration/command-line-utilities#ghe-org-admin-promote)." + + ```shell + ghe-org-admin-promote -u USERNAME -o actions + ``` ### Example: Using the `actions-sync` tool diff --git a/content/admin/installation/installing-github-enterprise-server-on-hyper-v.md b/content/admin/installation/installing-github-enterprise-server-on-hyper-v.md index eded2b581a..ac44a97135 100644 --- a/content/admin/installation/installing-github-enterprise-server-on-hyper-v.md +++ b/content/admin/installation/installing-github-enterprise-server-on-hyper-v.md @@ -1,6 +1,6 @@ --- title: Installing GitHub Enterprise Server on Hyper-V -intro: 'To install {% data variables.product.prodname_ghe_server %} on Hyper-V, you must deploy onto a machine running Windows Server 2008 through Windows Server 2016.' +intro: 'To install {% data variables.product.prodname_ghe_server %} on Hyper-V, you must deploy onto a machine running Windows Server 2008 through Windows Server 2019.' redirect_from: - /enterprise/admin/guides/installation/installing-github-enterprise-on-hyper-v/ - /enterprise/admin/installation/installing-github-enterprise-server-on-hyper-v @@ -13,7 +13,7 @@ topics: ### Prerequisites - {% data reusables.enterprise_installation.software-license %} -- You must have Windows Server 2008 through Windows Server 2016, which support Hyper-V. +- You must have Windows Server 2008 through Windows Server 2019, which support Hyper-V. - Most actions needed to create your virtual machine (VM) may also be performed using the [Hyper-V Manager](https://docs.microsoft.com/windows-server/virtualization/hyper-v/manage/remotely-manage-hyper-v-hosts). However, we recommend using the Windows PowerShell command-line shell for initial setup. Examples using PowerShell are included below. For more information, see the Microsoft guide "[Getting Started with Windows PowerShell](https://docs.microsoft.com/powershell/scripting/getting-started/getting-started-with-windows-powershell?view=powershell-5.1)." ### Hardware considerations diff --git a/content/admin/overview/github-ae-release-notes.md b/content/admin/overview/github-ae-release-notes.md index 38a619fc8e..dbd6bc961a 100644 --- a/content/admin/overview/github-ae-release-notes.md +++ b/content/admin/overview/github-ae-release-notes.md @@ -29,7 +29,7 @@ During this beta, {% data variables.product.prodname_advanced_security %} featur #### Manage teams from your identity provider (IdP) -Customers using SCIM (System for Cross-domain Identity Management) can now sync security groups in Azure Active Directory with {% data variables.product.company_short %} teams. Once a team has been linked to a security group, membership will be automatically updated in {% data variables.product.product_name %} when a user is added or removed from their assigned security group. For more information, see "[Synchronizing a team with an identity provider group](/github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group)." +Customers using SCIM (System for Cross-domain Identity Management) can now sync security groups in Azure Active Directory with {% data variables.product.company_short %} teams. Once a team has been linked to a security group, membership will be automatically updated in {% data variables.product.product_name %} when a user is added or removed from their assigned security group. For more information, see "[Synchronizing a team with an identity provider group](/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group)." #### IP allow lists beta @@ -37,7 +37,7 @@ Enterprise and organization owners can now use IP allow lists to restrict traffi This functionality is provided in addition to the ability to request network security group changes that filter traffic to the entirety of the {% data variables.product.product_name %} tenant. -For more information, see "[Restricting network traffic to your enterprise](/admin/configuration/restricting-network-traffic-to-your-enterprise)" and "[Managing allowed IP addresses for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization)." +For more information, see "[Restricting network traffic to your enterprise](/admin/configuration/restricting-network-traffic-to-your-enterprise)" and "[Managing allowed IP addresses for your organization](/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization)." #### Pull request auto-merge @@ -47,8 +47,8 @@ With auto-merge, pull requests can be set to merge automatically when all merge #### Developer changes -- [Organization owners can now disable publication](/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization) of {% data variables.product.prodname_pages %} sites from repositories in the organization. This will not unpublish existing sites. -- Repositories that use {% data variables.product.prodname_pages %} can now [build and deploy from any branch](/github/working-with-github-pages/about-github-pages#publishing-sources-for-github-pages-sites). +- [Organization owners can now disable publication](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization) of {% data variables.product.prodname_pages %} sites from repositories in the organization. This will not unpublish existing sites. +- Repositories that use {% data variables.product.prodname_pages %} can now [build and deploy from any branch](/pages/getting-started-with-github-pages/about-github-pages#publishing-sources-for-github-pages-sites). - When writing an issue or pull request, the list syntax for bullets, numbers, and tasks will now be autocompleted after you press `return` or `enter`. - You can now delete a directory in a repository from the repository page. When navigating to a directory, a new kebab button next to the "Add file" button gives the option to delete the directory. - It’s now easier and faster to [reference issues or pull requests](/github/writing-on-github/basic-writing-and-formatting-syntax#referencing-issues-and-pull-requests), with search across multiple words after the "#". @@ -65,7 +65,7 @@ With auto-merge, pull requests can be set to merge automatically when all merge ##### Default branch renaming -Enterprise and organization owners can now set the default branch name for new repositories. Enterprise owners can also enforce their choice of default branch name across all organizations or allow individual organizations to choose their own. For more information, see "[Enforcing repository management policies in your enterprise](/admin/policies/enforcing-repository-management-policies-in-your-enterprise#enforcing-a-policy-on-the-default-branch-name)" and "[Managing the default branch name for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)." +Enterprise and organization owners can now set the default branch name for new repositories. Enterprise owners can also enforce their choice of default branch name across all organizations or allow individual organizations to choose their own. For more information, see "[Enforcing repository management policies in your enterprise](/admin/policies/enforcing-repository-management-policies-in-your-enterprise#enforcing-a-policy-on-the-default-branch-name)" and "[Managing the default branch name for repositories in your organization](/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization)." Existing repositories are unaffected by these settings, and their default branch name will not be changed. diff --git a/content/admin/user-management/customizing-user-messages-for-your-enterprise.md b/content/admin/user-management/customizing-user-messages-for-your-enterprise.md index 8e7bbab01f..77758c45e6 100644 --- a/content/admin/user-management/customizing-user-messages-for-your-enterprise.md +++ b/content/admin/user-management/customizing-user-messages-for-your-enterprise.md @@ -72,17 +72,16 @@ Mandatory messages have a variety of uses. - Telling users how to get help with {% data variables.product.product_location %} - Ensuring that all users read your terms of service for using {% data variables.product.product_location %} -{% note %} - -**Note:** After you configure a mandatory message for {% data variables.product.product_location %}, you cannot change or remove the message. - -{% endnote %} - - If you include Markdown checkboxes in the message, all checkboxes must be selected before the user can dismiss the message. For example, if you include your terms of service in the mandatory message, you can require that each user selects a checkbox to confirm the user has read the terms. Each time a user sees a mandatory message, an audit log event is created. The event includes the version of the message that the user saw. For more information see "[Audited actions](/admin/user-management/audited-actions)." +{% note %} + +**Note:** If you change the mandatory message for {% data variables.product.product_location %}, users who have already acknowledged the message will not see the new message. + +{% endnote %} + {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.messages-tab %} diff --git a/content/admin/user-management/managing-projects-using-jira.md b/content/admin/user-management/managing-projects-using-jira.md index c6ea376e22..a5ee42f60c 100644 --- a/content/admin/user-management/managing-projects-using-jira.md +++ b/content/admin/user-management/managing-projects-using-jira.md @@ -1,6 +1,6 @@ --- -title: Managing projects using JIRA -intro: 'You can integrate JIRA with {% data variables.product.prodname_enterprise %} for project management.' +title: Managing projects using Jira +intro: 'You can integrate Jira with {% data variables.product.prodname_enterprise %} for project management.' redirect_from: - /enterprise/admin/guides/installation/project-management-using-jira/ - /enterprise/admin/articles/project-management-using-jira/ @@ -13,34 +13,54 @@ topics: - enterprise --- -### Connecting JIRA to a {% data variables.product.prodname_enterprise %} organization +### Connecting Jira to a {% data variables.product.prodname_enterprise %} organization -1. Sign into your {% data variables.product.prodname_enterprise %} account at http[s]://[hostname]/login. -1. In the upper right corner of any page, click the account settings (gear) icon. -1. In the left sidebar, click the name of your organization. -1. In the left sidebar, click **Applications**. -1. In the upper right corner of the **Organization applications** box, click **Register new application**. -1. Fill in the application settings: - - In the **Application name** field, type "JIRA". - - In the **Homepage URL** field, type the full URL of your JIRA instance. - - In the **Authorization callback URL** field, type the full URL of your JIRA instance. -1. Click **Register application**. -1. At the top of the page, note the **Client ID** and **Client Secret**. You will need these for configuring your JIRA instance. +1. Sign into your {% data variables.product.prodname_enterprise %} account at http[s]://[hostname]/login. If already signed in, click on the {% data variables.product.prodname_dotcom %} logo in the top left corner. +2. Click on your profile icon under the {% data variables.product.prodname_dotcom %} logo and select the organization you would like to connect with Jira. -### JIRA instance configuration + ![Select an organization](/assets/images/enterprise/orgs-and-teams/profile-select-organization.png) -1. On your JIRA instance, log into an account with administrative access. -1. At the top of the page, click the settings (gear) icon. -1. In the settings dropdown, choose **Add-ons**. -1. In the left sidebar, under **Source control**, click **DVCS accounts**. -1. Click **Link Bitbucket or GitHub account**. -1. In the **Add New Account** modal, fill in your {% data variables.product.prodname_enterprise %} settings: - - From the **Host** dropdown menu, choose **GitHub Enterprise**. +3. Click on the **Edit _organization name_ settings** link. + + ![Edit organization settings](/assets/images/enterprise/orgs-and-teams/edit-organization-settings.png) + +4. In the left sidebar, under **Developer settings**, click **OAuth Apps**. + + ![Select OAuth Apps](/assets/images/enterprise/orgs-and-teams/organization-dev-settings-oauth-apps.png) + +5. Click on the **Register new application** button. + + ![Register new application button](/assets/images/enterprise/orgs-and-teams/register-oauth-application-button.png) + +6. Fill in the application settings: + - In the **Application name** field, type "Jira" or any name you would like to use to identify the Jira instance. + - In the **Homepage URL** field, type the full URL of your Jira instance. + - In the **Authorization callback URL** field, type the full URL of your Jira instance. +7. Click **Register application**. +8. At the top of the page, note the **Client ID** and **Client Secret**. You will need these for configuring your Jira instance. + +### Jira instance configuration + +1. On your Jira instance, log into an account with administrative access. +2. At the top of the page, click the settings (gear) icon and choose **Applications**. + + ![Select Applications on Jira settings](/assets/images/enterprise/orgs-and-teams/jira/jira-applications.png) + +3. In the left sidebar, under **Integrations**, click **DVCS accounts**. + + ![Jira Integrations menu - DVCS accounts](/assets/images/enterprise/orgs-and-teams/jira/jira-integrations-dvcs.png) + +4. Click **Link Bitbucket Cloud or {% data variables.product.prodname_dotcom %} account**. + + ![Link GitHub account to Jira](/assets/images/enterprise/orgs-and-teams/jira/jira-link-github-account.png) + +5. In the **Add New Account** modal, fill in your {% data variables.product.prodname_enterprise %} settings: + - From the **Host** dropdown menu, choose **{% data variables.product.prodname_enterprise %}**. - In the **Team or User Account** field, type the name of your {% data variables.product.prodname_enterprise %} organization or personal account. - In the **OAuth Key** field, type the Client ID of your {% data variables.product.prodname_enterprise %} developer application. - In the **OAuth Secret** field, type the Client Secret for your {% data variables.product.prodname_enterprise %} developer application. - - If you don't want to link new repositories owned by your {% data variables.product.prodname_enterprise %} organization or personal account, unselect **Auto Link New Repositories**. - - If you don't want to enable smart commits, unselect **Enable Smart Commits**. + - If you don't want to link new repositories owned by your {% data variables.product.prodname_enterprise %} organization or personal account, deselect **Auto Link New Repositories**. + - If you don't want to enable smart commits, deselect **Enable Smart Commits**. - Click **Add**. -1. Review the permissions you are granting to your {% data variables.product.prodname_enterprise %} account and click **Authorize application**. -1. If necessary, type your password to continue. +6. Review the permissions you are granting to your {% data variables.product.prodname_enterprise %} account and click **Authorize application**. +7. If necessary, type your password to continue. diff --git a/content/code-security/secret-security/about-secret-scanning.md b/content/code-security/secret-security/about-secret-scanning.md index 68b1598540..1915cbf242 100644 --- a/content/code-security/secret-security/about-secret-scanning.md +++ b/content/code-security/secret-security/about-secret-scanning.md @@ -45,7 +45,7 @@ When {% data variables.product.prodname_secret_scanning %} detects a set of cred {% data variables.product.prodname_secret_scanning_caps %} is available on all organization-owned repositories as part of {% data variables.product.prodname_GH_advanced_security %}. It is not available on user-owned repositories. {% endif %} -If you're a repository administrator or an organization owner, you can enable {% data variables.product.prodname_secret_scanning %} for {% if currentVersion == "free-pro-team@latest" %} private{% endif %} repositories that are owned by organizations. You can enable {% data variables.product.prodname_secret_scanning %} for all your repositories, or for all new repositories within your organization.{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_secret_scanning_caps %} is not available for user-owned private repositories.{% endif %} For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)" and "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +If you're a repository administrator or an organization owner, you can enable {% data variables.product.prodname_secret_scanning %} for {% if currentVersion == "free-pro-team@latest" %} private{% endif %} repositories that are owned by organizations. You can enable {% data variables.product.prodname_secret_scanning %} for all your repositories, or for all new repositories within your organization.{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_secret_scanning_caps %} is not available for user-owned private repositories.{% endif %} For more information, see "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)" and "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." When you push commits to a{% if currentVersion == "free-pro-team@latest" %} private{% endif %} repository with {% data variables.product.prodname_secret_scanning %} enabled, {% data variables.product.prodname_dotcom %} scans the contents of the commits for secrets. diff --git a/content/code-security/secret-security/configuring-secret-scanning-for-your-repositories.md b/content/code-security/secret-security/configuring-secret-scanning-for-your-repositories.md index ff7cd65eb8..de5374ce76 100644 --- a/content/code-security/secret-security/configuring-secret-scanning-for-your-repositories.md +++ b/content/code-security/secret-security/configuring-secret-scanning-for-your-repositories.md @@ -77,4 +77,4 @@ You can also ignore individual alerts from {% data variables.product.prodname_se ### Further reading -- "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)" +- "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)" diff --git a/content/code-security/secure-coding/index.md b/content/code-security/secure-coding/index.md index cb7577cb39..88d811e9a0 100644 --- a/content/code-security/secure-coding/index.md +++ b/content/code-security/secure-coding/index.md @@ -1,7 +1,7 @@ --- title: Finding security vulnerabilities and errors in your code shortTitle: Secure coding -intro: 'Keep your code secure by using secret scanning to identify and fix potential security vulnerabilities and other errors in your code.' +intro: 'Keep your code secure by using {% data variables.product.prodname_code_scanning %} to identify and fix potential security vulnerabilities and other errors in your code.' product: '{% data reusables.gated-features.code-scanning %}' redirect_from: - /github/managing-security-vulnerabilities/finding-security-vulnerabilities-in-your-projects-code diff --git a/content/code-security/secure-coding/setting-up-code-scanning-for-a-repository.md b/content/code-security/secure-coding/setting-up-code-scanning-for-a-repository.md index 91b9a5c7b3..9058dabf56 100644 --- a/content/code-security/secure-coding/setting-up-code-scanning-for-a-repository.md +++ b/content/code-security/secure-coding/setting-up-code-scanning-for-a-repository.md @@ -32,7 +32,7 @@ You decide how to generate {% data variables.product.prodname_code_scanning %} a {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} -3. To the right of "{% data variables.product.prodname_code_scanning_capc %} alerts", click **Set up {% data variables.product.prodname_code_scanning %}**. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}If {% data variables.product.prodname_code_scanning %} is missing, you need to ask an organization owner or repository administrator to enable {% data variables.product.prodname_GH_advanced_security %}. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)" or "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)."{% endif %} +3. To the right of "{% data variables.product.prodname_code_scanning_capc %} alerts", click **Set up {% data variables.product.prodname_code_scanning %}**. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}If {% data variables.product.prodname_code_scanning %} is missing, you need to ask an organization owner or repository administrator to enable {% data variables.product.prodname_GH_advanced_security %}. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)" or "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)."{% endif %} !["Set up {% data variables.product.prodname_code_scanning %}" button to the right of "{% data variables.product.prodname_code_scanning_capc %}" in the Security Overview](/assets/images/help/security/overview-set-up-code-scanning.png) 4. Under "Get started with {% data variables.product.prodname_code_scanning %}", click **Set up this workflow** on the {% data variables.product.prodname_codeql_workflow %} or on a third-party workflow. !["Set up this workflow" button under "Get started with {% data variables.product.prodname_code_scanning %}" heading](/assets/images/help/repository/code-scanning-set-up-this-workflow.png){% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}Workflows are only displayed if they are relevant for the programming languages detected in the repository. The {% data variables.product.prodname_codeql_workflow %} is always displayed, but the "Set up this workflow" button is only enabled if {% data variables.product.prodname_codeql %} analysis supports the languages present in the repository.{% endif %} diff --git a/content/code-security/security-advisories/editing-a-security-advisory.md b/content/code-security/security-advisories/editing-a-security-advisory.md index 6ffda2c2c2..3d1680a3c2 100644 --- a/content/code-security/security-advisories/editing-a-security-advisory.md +++ b/content/code-security/security-advisories/editing-a-security-advisory.md @@ -17,6 +17,8 @@ You can credit people who helped discover, report, or fix a security vulnerabili If someone accepts credit, the person's username appears in the "Credits" section of the security advisory. Anyone with read access to the repository can see the advisory and the people who accepted credit for it. +If you believe you should be credited for a security advisory, please contact the person who created the advisory and ask them to edit the advisory to include your credit. Only the creator of the advisory can credit you, so please don't contact GitHub Support about credits for security advisories. + ### Editing a security advisory {% data reusables.repositories.navigate-to-repo %} diff --git a/content/code-security/security-overview/exploring-security-alerts.md b/content/code-security/security-overview/exploring-security-alerts.md index 3e9d077fe4..45c7c67a68 100644 --- a/content/code-security/security-overview/exploring-security-alerts.md +++ b/content/code-security/security-overview/exploring-security-alerts.md @@ -11,7 +11,7 @@ versions: ### About the security overview -You can use the security overview for a high-level view of the security status of your organization or to identify problematic repositories that require intervention. At the organization-level, the security overview displays aggregate and repository-specific security information for repositories owned by your organization. At the team-level, the security overview displays repository-specific security information for repositories that the team has admin privileges for. For more information, see "[Managing team access to an organization repository](/github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-repository)." +You can use the security overview for a high-level view of the security status of your organization or to identify problematic repositories that require intervention. At the organization-level, the security overview displays aggregate and repository-specific security information for repositories owned by your organization. At the team-level, the security overview displays repository-specific security information for repositories that the team has admin privileges for. For more information, see "[Managing team access to an organization repository](/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository)." The security overview indicates whether {% data variables.product.prodname_GH_advanced_security %} features are enabled for repositories owned by your organization and consolidates alerts from {% data variables.product.prodname_advanced_security %} features, including {% data variables.product.prodname_code_scanning %} alerts, {% data variables.product.prodname_dependabot_alerts %}, and {% data variables.product.prodname_secret_scanning %} alerts. For more information, see "[About securing your repository](/code-security/getting-started/about-securing-your-repository)." diff --git a/content/code-security/supply-chain-security/about-alerts-for-vulnerable-dependencies.md b/content/code-security/supply-chain-security/about-alerts-for-vulnerable-dependencies.md index 6e385e03eb..3076bdc6bb 100644 --- a/content/code-security/supply-chain-security/about-alerts-for-vulnerable-dependencies.md +++ b/content/code-security/supply-chain-security/about-alerts-for-vulnerable-dependencies.md @@ -48,9 +48,9 @@ For a list of the ecosystems that {% data variables.product.product_name %} can {% if currentVersion == "free-pro-team@latest" %}{% data variables.product.prodname_dotcom %} detects vulnerable dependencies in _public_ repositories and generates {% data variables.product.prodname_dependabot_alerts %} by default. Owners of private repositories, or people with admin access, can enable {% data variables.product.prodname_dependabot_alerts %} by enabling the dependency graph and {% data variables.product.prodname_dependabot_alerts %} for their repositories. -You can also enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +You can also enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." -For information about permission requirements for actions related to {% data variables.product.prodname_dependabot_alerts %}, see "[Repository permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization#permission-requirements-for-security-features)." +For information about permission requirements for actions related to {% data variables.product.prodname_dependabot_alerts %}, see "[Repository permission levels for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization#permission-requirements-for-security-features)." {% data variables.product.product_name %} starts generating the dependency graph immediately and generates alerts for any vulnerable dependencies as soon as they are identified. The graph is usually populated within minutes but this may take longer for repositories with many dependencies. For more information, see "[Managing data use settings for your private repository](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository)." {% endif %} diff --git a/content/code-security/supply-chain-security/about-the-dependency-graph.md b/content/code-security/supply-chain-security/about-the-dependency-graph.md index 3f516de9cb..237dcd1106 100644 --- a/content/code-security/supply-chain-security/about-the-dependency-graph.md +++ b/content/code-security/supply-chain-security/about-the-dependency-graph.md @@ -89,6 +89,6 @@ The recommended formats explicitly define which versions are used for all direct - "[Dependency graph](https://en.wikipedia.org/wiki/Dependency_graph)" on Wikipedia - "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)"{% if currentVersion == "free-pro-team@latest" %} -- "[Viewing insights for your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization)" +- "[Viewing insights for your organization](/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization)" - "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)" - "[Troubleshooting the detection of vulnerable dependencies](/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies)"{% endif %} diff --git a/content/code-security/supply-chain-security/configuration-options-for-dependency-updates.md b/content/code-security/supply-chain-security/configuration-options-for-dependency-updates.md index d4debc6b6c..600d4e8c7f 100644 --- a/content/code-security/supply-chain-security/configuration-options-for-dependency-updates.md +++ b/content/code-security/supply-chain-security/configuration-options-for-dependency-updates.md @@ -321,7 +321,7 @@ updates: {% note %} -**Note**: {% data variables.product.prodname_dependabot %} can only run version updates on manifest or lock files if it can access all of the dependencies in the file, even if you add inaccessible dependencies to the `ignore` option of your configuration file. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#allowing-dependabot-to-access-private-dependencies)" and "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors#dependabot-cant-resolve-your-dependency-files)." +**Note**: {% data variables.product.prodname_dependabot %} can only run version updates on manifest or lock files if it can access all of the dependencies in the file, even if you add inaccessible dependencies to the `ignore` option of your configuration file. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization#allowing-dependabot-to-access-private-dependencies)" and "[Troubleshooting {% data variables.product.prodname_dependabot %} errors](/github/managing-security-vulnerabilities/troubleshooting-dependabot-errors#dependabot-cant-resolve-your-dependency-files)." {% endnote %} diff --git a/content/code-security/supply-chain-security/configuring-dependabot-security-updates.md b/content/code-security/supply-chain-security/configuring-dependabot-security-updates.md index 83bf346c37..391fdce78b 100644 --- a/content/code-security/supply-chain-security/configuring-dependabot-security-updates.md +++ b/content/code-security/supply-chain-security/configuring-dependabot-security-updates.md @@ -48,7 +48,7 @@ If security updates are not enabled for your repository and you don't know why, You can enable or disable {% data variables.product.prodname_dependabot_security_updates %} for an individual repository (see below). -You can also enable or disable {% data variables.product.prodname_dependabot_security_updates %} for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +You can also enable or disable {% data variables.product.prodname_dependabot_security_updates %} for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." {% data variables.product.prodname_dependabot_security_updates %} require specific repository settings. For more information, see "[Supported repositories](#supported-repositories)." diff --git a/content/code-security/supply-chain-security/configuring-notifications-for-vulnerable-dependencies.md b/content/code-security/supply-chain-security/configuring-notifications-for-vulnerable-dependencies.md index 182e15babb..3dbe53430e 100644 --- a/content/code-security/supply-chain-security/configuring-notifications-for-vulnerable-dependencies.md +++ b/content/code-security/supply-chain-security/configuring-notifications-for-vulnerable-dependencies.md @@ -16,7 +16,7 @@ topics: {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.prodname_dependabot %} detects vulnerable dependencies in your repositories, we generate a {% data variables.product.prodname_dependabot %} alert and display it on the Security tab for the repository. {% data variables.product.product_name %} notifies the maintainers of affected repositories about the new alert according to their notification preferences.{% else %}When {% data variables.product.product_name %} detects vulnerable dependencies in your repositories, it sends security alerts.{% endif %}{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_dependabot %} is enabled by default on all public repositories. For {% data variables.product.prodname_dependabot_alerts %}, by default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability. {% endif %} -{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-a-feature-for-all-new-repositories-when-they-are-added)." +{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-a-feature-for-all-new-repositories-when-they-are-added)." {% endif %} {% if enterpriseServerVersions contains currentVersion and currentVersion == "enterprise-server@2.21" %} diff --git a/content/code-security/supply-chain-security/exploring-the-dependencies-of-a-repository.md b/content/code-security/supply-chain-security/exploring-the-dependencies-of-a-repository.md index 5bdea0f321..44e8ae34c2 100644 --- a/content/code-security/supply-chain-security/exploring-the-dependencies-of-a-repository.md +++ b/content/code-security/supply-chain-security/exploring-the-dependencies-of-a-repository.md @@ -75,7 +75,7 @@ For public repositories, the dependents view shows how the repository is used by Repository administrators can enable or disable the dependency graph for private repositories. -You can also enable or disable the dependency graph for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +You can also enable or disable the dependency graph for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} @@ -117,7 +117,7 @@ If a manifest or lock file is not processed, its dependencies are omitted from t ### Further reading - "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)"{% if currentVersion == "free-pro-team@latest" %} -- "[Viewing insights for your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization)" +- "[Viewing insights for your organization](/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization)" - "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)" - "[Understanding how {% data variables.product.product_name %} uses and protects your data](/github/understanding-how-github-uses-and-protects-your-data)" {% endif %} diff --git a/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md b/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md index 4f61410172..a42f21fc9d 100644 --- a/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md +++ b/content/developers/apps/identifying-and-authorizing-users-for-github-apps.md @@ -94,9 +94,9 @@ By default, the response takes the following form. The response parameters `expi ```json { - "access_token": "{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" or currentVersion == "github-ae@next" %}ghu_16C7e42F292c6912E7710c838347Ae178B4a"{% else %}e72e16c7e42f292c6912e7710c838347ae178b4a{% endif %}", + "access_token": "{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" or currentVersion == "github-ae@next" %}ghu_16C7e42F292c6912E7710c838347Ae178B4a{% else %}e72e16c7e42f292c6912e7710c838347ae178b4a{% endif %}", "expires_in": 28800, - "refresh_token": "{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" or currentVersion == "github-ae@next" %}ghr_1B4a2e77838347a7E420ce178F2E7c6912E169246c34E1ccbF66C46812d16D5B1A9Dc86A1498"{% else %}r1.c1b4a2e77838347a7e420ce178f2e7c6912e1692{% endif %}", + "refresh_token": "{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" or currentVersion == "github-ae@next" %}ghr_1B4a2e77838347a7E420ce178F2E7c6912E169246c34E1ccbF66C46812d16D5B1A9Dc86A1498{% else %}r1.c1b4a2e77838347a7e420ce178f2e7c6912e1692{% endif %}", "refresh_token_expires_in": 15811200, "scope": "", "token_type": "bearer" @@ -106,7 +106,7 @@ By default, the response takes the following form. The response parameters `expi By default, the response takes the following form: - access_token={% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" or currentVersion == "github-ae@next" %}ghu_16C7e42F292c6912E7710c838347Ae178B4a"{% else %}e72e16c7e42f292c6912e7710c838347ae178b4a{% endif %}&token_type=bearer + access_token={% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" or currentVersion == "github-ae@next" %}ghu_16C7e42F292c6912E7710c838347Ae178B4a{% else %}e72e16c7e42f292c6912e7710c838347ae178b4a{% endif %}&token_type=bearer {% endif %} diff --git a/content/developers/apps/refreshing-user-to-server-access-tokens.md b/content/developers/apps/refreshing-user-to-server-access-tokens.md index 608fd9205e..60e176a078 100644 --- a/content/developers/apps/refreshing-user-to-server-access-tokens.md +++ b/content/developers/apps/refreshing-user-to-server-access-tokens.md @@ -42,9 +42,9 @@ Name | Type | Description ```json { - "access_token": "{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" or currentVersion == "github-ae@next" %}ghu_16C7e42F292c6912E7710c838347Ae178B4a"{% else %}e72e16c7e42f292c6912e7710c838347ae178b4a{% endif %}", + "access_token": "{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" or currentVersion == "github-ae@next" %}ghu_16C7e42F292c6912E7710c838347Ae178B4a{% else %}e72e16c7e42f292c6912e7710c838347ae178b4a{% endif %}", "expires_in": "28800", - "refresh_token": "{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" or currentVersion == "github-ae@next" %}ghr_1B4a2e77838347a7E420ce178F2E7c6912E169246c34E1ccbF66C46812d16D5B1A9Dc86A1498"{% else %}r1.c1b4a2e77838347a7e420ce178f2e7c6912e169246c34e1ccbf66c46812d16d5b1a9dc86a149873c{% endif %}", + "refresh_token": "{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" or currentVersion == "github-ae@next" %}ghr_1B4a2e77838347a7E420ce178F2E7c6912E169246c34E1ccbF66C46812d16D5B1A9Dc86A1498{% else %}r1.c1b4a2e77838347a7e420ce178f2e7c6912e169246c34e1ccbf66c46812d16d5b1a9dc86a149873c{% endif %}", "refresh_token_expires_in": "15811200", "scope": "", "token_type": "bearer" diff --git a/content/developers/github-marketplace/about-marketplace-badges.md b/content/developers/github-marketplace/about-marketplace-badges.md index 11e6b80de5..d9bf33689a 100644 --- a/content/developers/github-marketplace/about-marketplace-badges.md +++ b/content/developers/github-marketplace/about-marketplace-badges.md @@ -13,7 +13,7 @@ Certain apps on the {% data variables.product.prodname_marketplace %} have the { - Verified ownership of their domain and has a verified badge on their profile - Confirmed their email address so {% data variables.product.prodname_dotcom %} Support can reach the organization -- Required two-factor authentication for their organization. For more information, see "[Requiring two-factor authentication in your organization](/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization)." +- Required two-factor authentication for their organization. For more information, see "[Requiring two-factor authentication in your organization](/organizations/keeping-your-organization-secure/requiring-two-factor-authentication-in-your-organization)." ![Marketplace badge for GitHub Apps](/assets/images/marketplace/apps-with-verified-publisher-badge-tooltip.png) diff --git a/content/developers/github-marketplace/applying-for-publisher-verification-for-your-organization.md b/content/developers/github-marketplace/applying-for-publisher-verification-for-your-organization.md index 77342b3bd8..d811ada581 100644 --- a/content/developers/github-marketplace/applying-for-publisher-verification-for-your-organization.md +++ b/content/developers/github-marketplace/applying-for-publisher-verification-for-your-organization.md @@ -24,8 +24,8 @@ To offer paid plans for your app, the app must be owned by an organization and y ![Publisher verification option in the organization settings sidebar](/assets/images/marketplace/publisher-verification-settings-option.png) 1. Under "Publisher Verification", complete the information in the checklist: - Ensure that your basic profile information is present and accurate. Also, make sure that you've included the best email address for support and updates from {% data variables.product.company_short %}. - - Ensure that Two-factor authentication is enabled for your organization. For more information, see "[Requiring two-factor authentication in your organization](/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization)." - - Submit a verified domain and ensure that a "Verified" badge displays on your organization's profile page. For related information, see "[Verifying your organization's domain](/github/setting-up-and-managing-organizations-and-teams/verifying-your-organizations-domain)." + - Ensure that Two-factor authentication is enabled for your organization. For more information, see "[Requiring two-factor authentication in your organization](/organizations/keeping-your-organization-secure/requiring-two-factor-authentication-in-your-organization)." + - Submit a verified domain and ensure that a "Verified" badge displays on your organization's profile page. For related information, see "[Verifying your organization's domain](/organizations/managing-organization-settings/verifying-your-organizations-domain)." ![Publisher Verification checklist](/assets/images/marketplace/publisher-verification-checklist.png) diff --git a/content/developers/overview/managing-deploy-keys.md b/content/developers/overview/managing-deploy-keys.md index ad419e8717..27a3bf1b8c 100644 --- a/content/developers/overview/managing-deploy-keys.md +++ b/content/developers/overview/managing-deploy-keys.md @@ -113,6 +113,36 @@ You can then use the hostname's alias to interact with the repository using SSH, $ git clone git@{% if currentVersion == "free-pro-team@latest" %}github.com{% else %}my-GHE-hostname.com{% endif %}-repo-1:OWNER/repo-1.git ``` +### Server-to-server tokens + +If your server needs to access repositories across one or more organizations, you can use a GitHub App to define the access you need, and then generate _tightly-scoped_, _server-to-server_ tokens from that GitHub App. The server-to-server tokens can be scoped to single or multiple repositories, and can have fine-grained permissions. For example, you can generate a token with read-only access to a repository's contents. + +Since GitHub Apps are a first class actor on {% data variables.product.product_name %}, the server-to-server tokens are decoupled from any GitHub user, which makes them comparable to "service tokens". Additionally, server-to-server tokens have dedicated rate limits that scale with the size of the organizations that they act upon. For more information, see [Rate limits for Github Apps](/developers/apps/rate-limits-for-github-apps). + +##### Pros + +- Tightly-scoped tokens with well-defined permission sets and expiration times (1 hour, or less if revoked manually using the API). +- Dedicated rate limits that grow with your organization. +- Decoupled from GitHub user identities, so they do not consume any licensed seats. +- Never granted a password, so cannot be directly signed in to. + +##### Cons + +- Additional setup is needed to create the GitHub App. +- Server-to-server tokens expire after 1 hour, and so need to be re-generated, typically on-demand using code. + +##### Setup + +1. Determine if your GitHub App should be public or private. If your GitHub App will only act on repositories within your organization, you likely want it private. +1. Determine the permissions your GitHub App requires, such as read-only access to repository contents. +1. Create your GitHub App via your organization's settings page. For more information, see [Creating a GitHub App](/developers/apps/creating-a-github-app). +1. Note your GitHub App `id`. +1. Generate and download your GitHub App's private key, and store this safely. For more information, see [Generating a private key](/developers/apps/authenticating-with-github-apps#generating-a-private-key). +1. Install your GitHub App on the repositories it needs to act upon, optionally you may install the GitHub App on all repositories in your organization. +1. Identify the `installation_id` that represents the connection between your GitHub App and the organization repositories it can access. Each GitHub App and organization pair have at most a single `installation_id`. You can identify this `installation_id` via [Get an organization installation for the authenticated app](/rest/reference/apps#get-an-organization-installation-for-the-authenticated-app). This requires authenticating as a GitHub App using a JWT, for more information see [Authenticating as a GitHub App](/developers/apps/authenticating-with-github-apps#authenticating-as-a-github-app). +1. Generate a server-to-server token using the corresponding REST API endpoint, [Create an installation access token for an app](/rest/reference/apps#create-an-installation-access-token-for-an-app). This requires authenticating as a GitHub App using a JWT, for more information see [Authenticating as a GitHub App](/developers/apps/authenticating-with-github-apps#authenticating-as-a-github-app), and [Authenticating as an installation](/developers/apps/authenticating-with-github-apps#authenticating-as-an-installation). +1. Use this server-to-server token to interact with your repositories, either via the REST or GraphQL APIs, or via a Git client. + ### Machine users If your server needs to access multiple repositories, you can create a new {% data variables.product.product_name %} account and attach an SSH key that will be used exclusively for automation. Since this {% data variables.product.product_name %} account won't be used by a human, it's called a _machine user_. You can add the machine user as a [collaborator][collaborator] on a personal repository (granting read and write access), as an [outside collaborator][outside-collaborator] on an organization repository (granting read, write, or admin access), or to a [team][team] with access to the repositories it needs to automate (granting the permissions of the team). diff --git a/content/developers/webhooks-and-events/securing-your-webhooks.md b/content/developers/webhooks-and-events/securing-your-webhooks.md index cfdf4c9a1e..a643456e4c 100644 --- a/content/developers/webhooks-and-events/securing-your-webhooks.md +++ b/content/developers/webhooks-and-events/securing-your-webhooks.md @@ -94,4 +94,4 @@ Your language and server implementations may differ from this example code. Howe * Using a plain `==` operator is **not advised**. A method like [`secure_compare`][secure_compare] performs a "constant time" string comparison, which helps mitigate certain timing attacks against regular equality operators. -[secure_compare]: http://rubydoc.info/github/rack/rack/master/Rack/Utils.secure_compare +[secure_compare]: https://rubydoc.info/github/rack/rack/master/Rack/Utils:secure_compare diff --git a/content/discussions/collaborating-with-your-community-using-discussions/about-discussions.md b/content/discussions/collaborating-with-your-community-using-discussions/about-discussions.md index 9e1768ab20..c11bfa475c 100644 --- a/content/discussions/collaborating-with-your-community-using-discussions/about-discussions.md +++ b/content/discussions/collaborating-with-your-community-using-discussions/about-discussions.md @@ -19,7 +19,7 @@ With {% data variables.product.prodname_discussions %}, the community for your p You don't need to close a discussion like you close an issue or a pull request. -If a repository administrator or project maintainer enables discussions for a repository, anyone who visits the repository can create and participate in discussions for the repository. Repository administrators and project maintainers can manage discussions and discussion categories in a repository, and pin discussions to increase the visibility of the discussion. Moderators and collaborators can mark comments as answers, lock discussions, and convert issues to discussions. For more information, see "[Repository permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization)." +If a repository administrator or project maintainer enables discussions for a repository, anyone who visits the repository can create and participate in discussions for the repository. Repository administrators and project maintainers can manage discussions and discussion categories in a repository, and pin discussions to increase the visibility of the discussion. Moderators and collaborators can mark comments as answers, lock discussions, and convert issues to discussions. For more information, see "[Repository permission levels for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization)." For more information about management of discussions for your repository, see "[Managing discussions in your repository](/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository)." diff --git a/content/discussions/guides/best-practices-for-community-conversations-on-github.md b/content/discussions/guides/best-practices-for-community-conversations-on-github.md index 37c0347541..ee63e656d2 100644 --- a/content/discussions/guides/best-practices-for-community-conversations-on-github.md +++ b/content/discussions/guides/best-practices-for-community-conversations-on-github.md @@ -29,7 +29,7 @@ You can use {% data variables.product.prodname_discussions %} to discuss big pic Issues are useful for discussing specific details of a project such as bug reports and planned improvements. For more information, see "[About issues](/articles/about-issues)." Pull requests allow you to comment directly on proposed changes. For more information, see "[About pull requests](/articles/about-pull-requests)" and "[Commenting on a pull request](/articles/commenting-on-a-pull-request)." -{% data reusables.organizations.team-discussions-purpose %} For more information, see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)." +{% data reusables.organizations.team-discussions-purpose %} For more information, see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)." ### Following contributing guidelines diff --git a/content/discussions/guides/granting-higher-permissions-to-top-contributors.md b/content/discussions/guides/granting-higher-permissions-to-top-contributors.md index 8ded0aaa3a..6c12ee38c7 100644 --- a/content/discussions/guides/granting-higher-permissions-to-top-contributors.md +++ b/content/discussions/guides/granting-higher-permissions-to-top-contributors.md @@ -21,7 +21,7 @@ The most helpful contributors for the past 30 days are highlighted on the {% dat People with triage permissions for a repository can help moderate a project's discussions by marking comments as answers, locking discussions that are not longer useful or are damaging to the community, and converting issues to discussions when an idea is still in the early stages of development. For more information, see "[Moderating discussions](/discussions/managing-discussions-for-your-community/moderating-discussions)." -For more information about repository permission levels and {% data variables.product.prodname_discussions %}, see "[Repository permissions levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization)." +For more information about repository permission levels and {% data variables.product.prodname_discussions %}, see "[Repository permissions levels for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization)." ### Step 3: Change permissions levels for top contributors diff --git a/content/discussions/index.md b/content/discussions/index.md index 84d965fd4a..9974eb20a2 100644 --- a/content/discussions/index.md +++ b/content/discussions/index.md @@ -22,6 +22,8 @@ featuredLinks: - /discussions/guides/finding-discussions-across-multiple-repositories - /discussions/collaborating-with-your-community-using-discussions/collaborating-with-maintainers-using-discussions - /discussions/managing-discussions-for-your-community/managing-categories-for-discussions-in-your-repository +changelog: + label: 'discussions' product_video: https://www.youtube-nocookie.com/embed/IpBw2SJkFyk layout: product-landing versions: diff --git a/content/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository.md b/content/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository.md index 4c77f71e2c..2d14f8ed52 100644 --- a/content/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository.md +++ b/content/discussions/managing-discussions-for-your-community/managing-discussions-in-your-repository.md @@ -12,7 +12,7 @@ versions: {% data reusables.discussions.about-discussions %} For more information about discussions, see "[About discussions](/discussions/collaborating-with-your-community-using-discussions/about-discussions)." -Organization owners can choose the permissions required to create a discussion for repositories owned by the organization. For more information, see "[Managing discussion creation for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-discussion-creation-for-repositories-in-your-organization)." +Organization owners can choose the permissions required to create a discussion for repositories owned by the organization. For more information, see "[Managing discussion creation for repositories in your organization](/organizations/managing-organization-settings/managing-discussion-creation-for-repositories-in-your-organization)." As a discussions maintainer, you can create community resources to encourage discussions that are aligned with the overall project goal and maintain a friendly open forum for collaborators. Creating a code of conduct or contribution guidelines for collaborators to follow will help facilitate a collaborative and productive forum. For more information on creating community resources, see "[Adding a code of conduct to your project](/communities/setting-up-your-project-for-healthy-contributions/adding-a-code-of-conduct-to-your-project)," and "[Setting guidelines for repository contributors](/communities/setting-up-your-project-for-healthy-contributions/setting-guidelines-for-repository-contributors)." diff --git a/content/education/index.md b/content/education/index.md index 44ffabc2e0..abd70e5dc1 100644 --- a/content/education/index.md +++ b/content/education/index.md @@ -19,21 +19,8 @@ featuredLinks: - /desktop - /github/getting-started-with-github/github-cli - /education/manage-coursework-with-github-classroom/teach-with-github-classroom - changelog: - - title: 'Try something new at Local Hack Day: Learn' - date: '2020-10-15' - href: https://github.blog/2020-10-15-try-something-new-at-local-hack-day-learn/ - - title: 'Remote Education: Creating community through shared experiences' - date: '2020-09-24' - href: https://github.blog/2020-09-24-remote-education-creating-community-through-shared-experiences/ - - title: 'Remote Education: A series of best practices for online campus communities' - date: '2020-09-10' - href: https://github.blog/2020-09-10-remote-education-a-series-of-best-practices-for-online-campus-communities/ - - title: Welcome to the inaugural class of MLH Fellows - date: '2020-06-24' - href: https://github.blog/2020-06-24-welcome-to-the-inaugural-class-of-mlh-fellows/ - + label: 'education' layout: product-landing versions: free-pro-team: '*' diff --git a/content/education/manage-coursework-with-github-classroom/create-a-group-assignment.md b/content/education/manage-coursework-with-github-classroom/create-a-group-assignment.md index 45df283ef9..95fdfc6fe1 100644 --- a/content/education/manage-coursework-with-github-classroom/create-a-group-assignment.md +++ b/content/education/manage-coursework-with-github-classroom/create-a-group-assignment.md @@ -17,7 +17,7 @@ When a student accepts a group assignment, the student can create a new team or {% data reusables.classroom.about-assignments %} -You can decide how many teams one assignment can have, and how many members each team can have. Each team that a student creates for an assignment is a team within your organization on {% data variables.product.product_name %}. The visibility of the team is secret. Teams that you create on {% data variables.product.product_name %} will not appear in {% data variables.product.prodname_classroom %}. For more information, see "[About teams](/github/setting-up-and-managing-organizations-and-teams/about-teams)." +You can decide how many teams one assignment can have, and how many members each team can have. Each team that a student creates for an assignment is a team within your organization on {% data variables.product.product_name %}. The visibility of the team is secret. Teams that you create on {% data variables.product.product_name %} will not appear in {% data variables.product.prodname_classroom %}. For more information, see "[About teams](/organizations/organizing-members-into-teams/about-teams)." For a video demonstration of the creation of a group assignment, see "[Basics of setting up {% data variables.product.prodname_classroom %}](/education/manage-coursework-with-github-classroom/basics-of-setting-up-github-classroom)." diff --git a/content/education/manage-coursework-with-github-classroom/manage-classrooms.md b/content/education/manage-coursework-with-github-classroom/manage-classrooms.md index 845faf1938..4ad2ceef98 100644 --- a/content/education/manage-coursework-with-github-classroom/manage-classrooms.md +++ b/content/education/manage-coursework-with-github-classroom/manage-classrooms.md @@ -20,7 +20,7 @@ redirect_from: After you create a classroom, {% data variables.product.prodname_classroom %} will prompt you to invite teaching assistants (TAs) and admins to the classroom. Each classroom can have one or more admins. Admins can be teachers, TAs, or any other course administrator who you'd like to have control over your classrooms on {% data variables.product.prodname_classroom %}. -Invite TAs and admins to your classroom by inviting the user accounts on {% data variables.product.product_name %} to your organization as organization owners and sharing the URL for your classroom. Organization owners can administer any classroom for the organization. For more information, see "[Permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization)" and "[Inviting users to join your organization](/github/setting-up-and-managing-organizations-and-teams/inviting-users-to-join-your-organization)." +Invite TAs and admins to your classroom by inviting the user accounts on {% data variables.product.product_name %} to your organization as organization owners and sharing the URL for your classroom. Organization owners can administer any classroom for the organization. For more information, see "[Permission levels for an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/permission-levels-for-an-organization)" and "[Inviting users to join your organization](/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization)." When you're done using a classroom, you can archive the classroom and refer to the classroom, roster, and assignments later, or you can delete the classroom if you no longer need the classroom. @@ -34,7 +34,7 @@ When you first share the URL for an assignment with a student, the student must ### Prerequisites -You must have an organization account on {% data variables.product.product_name %} to manage classrooms on {% data variables.product.prodname_classroom %}. For more information, see "[Types of {% data variables.product.company_short %} accounts](/github/getting-started-with-github/types-of-github-accounts#organization-accounts)" and "[Creating a new organization from scratch](/github/setting-up-and-managing-organizations-and-teams/creating-a-new-organization-from-scratch)." +You must have an organization account on {% data variables.product.product_name %} to manage classrooms on {% data variables.product.prodname_classroom %}. For more information, see "[Types of {% data variables.product.company_short %} accounts](/github/getting-started-with-github/types-of-github-accounts#organization-accounts)" and "[Creating a new organization from scratch](/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch)." You must authorize the OAuth app for {% data variables.product.prodname_classroom %} for your organization to manage classrooms for your organization account. For more information, see "[Authorizing OAuth Apps](/github/authenticating-to-github/authorizing-oauth-apps)." diff --git a/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md b/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md index d7afb49e30..68990facf8 100644 --- a/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md +++ b/content/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository.md @@ -26,7 +26,7 @@ Alternatively, you can enable {% data variables.product.prodname_actions %} in y {% note %} -**Note:** You might not be able to manage these settings if your organization has an overriding policy or is managed by an enterprise that has overriding policy. For more information, see "[Disabling or limiting {% data variables.product.prodname_actions %} for your organization](/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization)" or {% if currentVersion == "free-pro-team@latest" %}"[Enforcing {% data variables.product.prodname_actions %} policies in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account)."{% elsif currentVersion ver_gt "enterprise-server@2.21"%}"[Enforcing {% data variables.product.prodname_actions %} policies for your enterprise](/enterprise/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise)."{% endif %} +**Note:** You might not be able to manage these settings if your organization has an overriding policy or is managed by an enterprise that has overriding policy. For more information, see "[Disabling or limiting {% data variables.product.prodname_actions %} for your organization](/organizations/managing-organization-settings/disabling-or-limiting-github-actions-for-your-organization)" or {% if currentVersion == "free-pro-team@latest" %}"[Enforcing {% data variables.product.prodname_actions %} policies in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account)."{% elsif currentVersion ver_gt "enterprise-server@2.21"%}"[Enforcing {% data variables.product.prodname_actions %} policies for your enterprise](/enterprise/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise)."{% endif %} {% endnote %} @@ -48,7 +48,7 @@ You can disable all workflows for a repository or set a policy that configures w {% note %} -**Note:** You might not be able to manage these settings if your organization has an overriding policy or is managed by an enterprise that has overriding policy. For more information, see "[Disabling or limiting {% data variables.product.prodname_actions %} for your organization](/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization)" or {% if currentVersion == "free-pro-team@latest" %}"[Enforcing {% data variables.product.prodname_actions %} policies in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account)."{% elsif currentVersion ver_gt "enterprise-server@2.21" %}"[Enforcing {% data variables.product.prodname_actions %} policies for your enterprise](/enterprise/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise)." +**Note:** You might not be able to manage these settings if your organization has an overriding policy or is managed by an enterprise that has overriding policy. For more information, see "[Disabling or limiting {% data variables.product.prodname_actions %} for your organization](/organizations/managing-organization-settings/disabling-or-limiting-github-actions-for-your-organization)" or {% if currentVersion == "free-pro-team@latest" %}"[Enforcing {% data variables.product.prodname_actions %} policies in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-github-actions-policies-in-your-enterprise-account)."{% elsif currentVersion ver_gt "enterprise-server@2.21" %}"[Enforcing {% data variables.product.prodname_actions %} policies for your enterprise](/enterprise/admin/github-actions/enforcing-github-actions-policies-for-your-enterprise)." {% endif %} diff --git a/content/github/administering-a-repository/managing-auto-merge-for-pull-requests-in-your-repository.md b/content/github/administering-a-repository/managing-auto-merge-for-pull-requests-in-your-repository.md index 0e7cb11f0f..da374e09b2 100644 --- a/content/github/administering-a-repository/managing-auto-merge-for-pull-requests-in-your-repository.md +++ b/content/github/administering-a-repository/managing-auto-merge-for-pull-requests-in-your-repository.md @@ -11,7 +11,11 @@ topics: - repositories --- -If you allow auto-merge for pull requests in your repository, people can configure individual pull requests in the repository to merge automatically when all merge requirements are met. For more information, see "[Automatically merging a pull request](/github/collaborating-with-issues-and-pull-requests/automatically-merging-a-pull-request)." +### About auto-merge + +If you allow auto-merge for pull requests in your repository, people with write permissions can configure individual pull requests in the repository to merge automatically when all merge requirements are met. {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@next" or currentVersion ver_gt "enterprise-server@3.1" %}If someone who does not have write permissions pushes changes to a pull request that has auto-merge enabled, auto-merge will be disabled for that pull request. {% endif %}For more information, see "[Automatically merging a pull request](/github/collaborating-with-issues-and-pull-requests/automatically-merging-a-pull-request)." + +### Managing auto-merge {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} diff --git a/content/github/administering-a-repository/managing-releases-in-a-repository.md b/content/github/administering-a-repository/managing-releases-in-a-repository.md index 0998c7252e..d12858667a 100644 --- a/content/github/administering-a-repository/managing-releases-in-a-repository.md +++ b/content/github/administering-a-repository/managing-releases-in-a-repository.md @@ -52,6 +52,10 @@ You can choose whether {% data variables.large_files.product_name_long %} ({% da ![Providing a DMG with the Release](/assets/images/help/releases/releases_adding_binary.gif) 8. To notify users that the release is not ready for production and may be unstable, select **This is a pre-release**. ![Checkbox to mark a release as prerelease](/assets/images/help/releases/prerelease_checkbox.png) +{%- if currentVersion == "free-pro-team@latest" %} +1. Optionally, select **Create a discussion for this release**, then select the **Category** drop-down menu and click a category for the release discussion. + ![Checkbox to create a release discussion and drop-down menu to choose a category](/assets/images/help/releases/create-release-discussion.png) +{%- endif %} 9. If you're ready to publicize your release, click **Publish release**. To work on the release later, click **Save draft**. ![Publish release and Draft release buttons](/assets/images/help/releases/release_buttons.png) diff --git a/content/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository.md b/content/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository.md index 4eed68ffc8..9d6fd613cc 100644 --- a/content/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository.md +++ b/content/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository.md @@ -103,4 +103,4 @@ Organization owners and repository administrators can only grant access to view ### Further reading - "[About securing your repository](/github/administering-a-repository/about-securing-your-repository)" -- "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)" +- "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)" diff --git a/content/github/administering-a-repository/managing-teams-and-people-with-access-to-your-repository.md b/content/github/administering-a-repository/managing-teams-and-people-with-access-to-your-repository.md index fc4dac0766..8bd8f523fd 100644 --- a/content/github/administering-a-repository/managing-teams-and-people-with-access-to-your-repository.md +++ b/content/github/administering-a-repository/managing-teams-and-people-with-access-to-your-repository.md @@ -16,7 +16,7 @@ For each repository that you administer on {% data variables.product.prodname_do This overview can help you audit access to your repository, onboard or off-board contractors or employees, and effectively respond to security incidents. -For more information about repository permission levels, see "[Permission levels for a user account repository](/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository)" and "[Repository permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization)." +For more information about repository permission levels, see "[Permission levels for a user account repository](/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository)" and "[Repository permission levels for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization)." ![Access management overview](/assets/images/help/repository/manage-access-overview.png) @@ -58,4 +58,4 @@ For more information about repository permission levels, see "[Permission levels ### Further reading - "[Setting repository visibility](/github/administering-a-repository/setting-repository-visibility)" -- "[Setting base permissions for an organization](/github/setting-up-and-managing-organizations-and-teams/setting-base-permissions-for-an-organization)" +- "[Setting base permissions for an organization](/organizations/managing-access-to-your-organizations-repositories/setting-base-permissions-for-an-organization)" diff --git a/content/github/administering-a-repository/managing-the-forking-policy-for-your-repository.md b/content/github/administering-a-repository/managing-the-forking-policy-for-your-repository.md index 6d6be04cd2..1aa967f98b 100644 --- a/content/github/administering-a-repository/managing-the-forking-policy-for-your-repository.md +++ b/content/github/administering-a-repository/managing-the-forking-policy-for-your-repository.md @@ -13,7 +13,7 @@ topics: - repositories --- -An organization owner must allow forks of private{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %} and internal{% endif %} repositories on the organization level before you can allow or disallow forks for a specific repository. For more information, see "[Managing the forking policy for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization)." +An organization owner must allow forks of private{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %} and internal{% endif %} repositories on the organization level before you can allow or disallow forks for a specific repository. For more information, see "[Managing the forking policy for your organization](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization)." {% data reusables.organizations.internal-repos-enterprise %} diff --git a/content/github/administering-a-repository/renaming-a-repository.md b/content/github/administering-a-repository/renaming-a-repository.md index c2d3a38c1d..47f18f74c5 100644 --- a/content/github/administering-a-repository/renaming-a-repository.md +++ b/content/github/administering-a-repository/renaming-a-repository.md @@ -17,7 +17,7 @@ When you rename a repository, all existing information, with the exception of pr * Stars * Followers -For more information on project sites, see "[About {% data variables.product.prodname_pages %}](/github/working-with-github-pages/about-github-pages#types-of-github-pages-sites)." +For more information on project sites, see "[About {% data variables.product.prodname_pages %}](/pages/getting-started-with-github-pages/about-github-pages#types-of-github-pages-sites)." In addition to redirecting web traffic, all `git clone`, `git fetch`, or `git push` operations targeting the previous location will continue to function as if made on the new location. However, to reduce confusion, we strongly recommend updating any existing local clones to point to the new repository URL. You can do this by using `git remote` on the command line: @@ -29,7 +29,7 @@ For more information, see "[Managing remote repositories](/github/getting-starte {% if currentVersion == "free-pro-team@latest" %} -If you plan to rename a repository that has a {% data variables.product.prodname_pages %} site, we recommend using a custom domain for your site. This ensures that the site's URL isn't impacted by renaming the repository. For more information, see "[About custom domains and {% data variables.product.prodname_pages %} site](/github/working-with-github-pages/about-custom-domains-and-github-pages)." +If you plan to rename a repository that has a {% data variables.product.prodname_pages %} site, we recommend using a custom domain for your site. This ensures that the site's URL isn't impacted by renaming the repository. For more information, see "[About custom domains and {% data variables.product.prodname_pages %} site](/pages/configuring-a-custom-domain-for-your-github-pages-site/about-custom-domains-and-github-pages)." {% endif %} diff --git a/content/github/administering-a-repository/setting-repository-visibility.md b/content/github/administering-a-repository/setting-repository-visibility.md index 587bf86a29..e356187e86 100644 --- a/content/github/administering-a-repository/setting-repository-visibility.md +++ b/content/github/administering-a-repository/setting-repository-visibility.md @@ -16,7 +16,7 @@ topics: ### About repository visibility changes -Organization owners can restrict the ability to change repository visibility to organization owners only. For more information, see "[Restricting repository visibility changes in your organization](/github/setting-up-and-managing-organizations-and-teams/restricting-repository-visibility-changes-in-your-organization)." +Organization owners can restrict the ability to change repository visibility to organization owners only. For more information, see "[Restricting repository visibility changes in your organization](/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization)." We recommend reviewing the following caveats before you change the visibility of a repository. diff --git a/content/github/authenticating-to-github/about-authentication-with-saml-single-sign-on.md b/content/github/authenticating-to-github/about-authentication-with-saml-single-sign-on.md index c7f6ff6491..010d673100 100644 --- a/content/github/authenticating-to-github/about-authentication-with-saml-single-sign-on.md +++ b/content/github/authenticating-to-github/about-authentication-with-saml-single-sign-on.md @@ -51,5 +51,5 @@ After an enterprise or organization owner enables or enforces SAML SSO for an or ### Further reading -{% if currentVersion == "free-pro-team@latest" %}- "[About identity and access management with SAML single sign-on](/github/setting-up-and-managing-organizations-and-teams/about-identity-and-access-management-with-saml-single-sign-on)"{% endif %} +{% if currentVersion == "free-pro-team@latest" %}- "[About identity and access management with SAML single sign-on](/organizations/managing-saml-single-sign-on-for-your-organization/about-identity-and-access-management-with-saml-single-sign-on)"{% endif %} {% if currentVersion == "github-ae@latest" %}- "[About identity and access management for your enterprise](/admin/authentication/about-identity-and-access-management-for-your-enterprise)"{% endif %} diff --git a/content/github/authenticating-to-github/creating-a-personal-access-token.md b/content/github/authenticating-to-github/creating-a-personal-access-token.md index fe174b149d..754e8fa567 100644 --- a/content/github/authenticating-to-github/creating-a-personal-access-token.md +++ b/content/github/authenticating-to-github/creating-a-personal-access-token.md @@ -17,13 +17,13 @@ topics: Personal access tokens (PATs) are an alternative to using passwords for authentication to {% data variables.product.product_name %} when using the [GitHub API](/rest/overview/other-authentication-methods#via-oauth-and-personal-access-tokens) or the [command line](#using-a-token-on-the-command-line). -{% if currentVersion == "free-pro-team@latest" %}If you want to use a PAT to access resources owned by an organization that uses SAML SSO, you must authorize the PAT. For more information, see "[About authentication with SAML single sign-on](/articles/about-authentication-with-saml-single-sign-on)" and "[Authorizing a personal access token for use with SAML single sign-on](/articles/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on)."{% endif %} +{% if currentVersion == "free-pro-team@latest" %}If you want to use a PAT to access resources owned by an organization that uses SAML SSO, you must authorize the PAT. For more information, see "[About authentication with SAML single sign-on](/github/authenticating-to-github/about-authentication-with-saml-single-sign-on)" and "[Authorizing a personal access token for use with SAML single sign-on](/github/authenticating-to-github/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on)."{% endif %} {% if currentVersion == "free-pro-team@latest" %}{% data reusables.user_settings.removes-personal-access-tokens %}{% endif %} ### Creating a token -{% if currentVersion == "free-pro-team@latest" %}1. [Verify your email address](/articles/verifying-your-email-address), if it hasn't been verified yet.{% endif %} +{% if currentVersion == "free-pro-team@latest" %}1. [Verify your email address](/github/getting-started-with-github/verifying-your-email-address), if it hasn't been verified yet.{% endif %} {% data reusables.user_settings.access_settings %} {% data reusables.user_settings.developer_settings %} {% data reusables.user_settings.personal_access_tokens %} @@ -47,13 +47,13 @@ Personal access tokens (PATs) are an alternative to using passwords for authenti {% else %} ![Newly created token](/assets/images/help/settings/personal_access_tokens_ghe_legacy.png) {% endif %} - {% warning %} **Warning:** Treat your tokens like passwords and keep them secret. When working with the API, use tokens as environment variables instead of hardcoding them into your programs. {% endwarning %} -{% if currentVersion == "free-pro-team@latest" %}9. To use your token to authenticate to an organization that uses SAML SSO, [authorize the token for use with a SAML single-sign-on organization](/articles/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on).{% endif %} + +{% if currentVersion == "free-pro-team@latest" %}9. To use your token to authenticate to an organization that uses SAML SSO, [authorize the token for use with a SAML single-sign-on organization](/github/authenticating-to-github/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on).{% endif %} ### Using a token on the command line @@ -61,7 +61,7 @@ Personal access tokens (PATs) are an alternative to using passwords for authenti Personal access tokens can only be used for HTTPS Git operations. If your repository uses an SSH remote URL, you will need to [switch the remote from SSH to HTTPS](/github/getting-started-with-github/managing-remote-repositories/#switching-remote-urls-from-ssh-to-https). -If you are not prompted for your username and password, your credentials may be cached on your computer. You can [update your credentials in the Keychain](/articles/updating-credentials-from-the-osx-keychain) to replace your old password with the token. +If you are not prompted for your username and password, your credentials may be cached on your computer. You can [update your credentials in the Keychain](/github/getting-started-with-github/updating-credentials-from-the-macos-keychain) to replace your old password with the token. ### Further reading diff --git a/content/github/authenticating-to-github/creating-a-strong-password.md b/content/github/authenticating-to-github/creating-a-strong-password.md index 11fb184df2..757915ebfc 100644 --- a/content/github/authenticating-to-github/creating-a-strong-password.md +++ b/content/github/authenticating-to-github/creating-a-strong-password.md @@ -20,7 +20,7 @@ To keep your account secure, we recommend you follow these best practices: - Use a password manager, such as [LastPass](https://lastpass.com/) or [1Password](https://1password.com/), to generate a password of at least 15 characters. - Generate a unique password for {% data variables.product.product_name %}. If you use your {% data variables.product.product_name %} password elsewhere and that service is compromised, then attackers or other malicious actors could use that information to access your {% data variables.product.product_name %} account. - Configure two-factor authentication for your personal account. For more information, see "[About two-factor authentication](/articles/about-two-factor-authentication)." -- Never share your password, even with a potential collaborator. Each person should use their own personal account on {% data variables.product.product_name %}. For more information on ways to collaborate, see: "[Inviting collaborators to a personal repository](/articles/inviting-collaborators-to-a-personal-repository)," "[About collaborative development models](/articles/about-collaborative-development-models/)," or "[Collaborating with groups in organizations](/articles/collaborating-with-groups-in-organizations/)." +- Never share your password, even with a potential collaborator. Each person should use their own personal account on {% data variables.product.product_name %}. For more information on ways to collaborate, see: "[Inviting collaborators to a personal repository](/articles/inviting-collaborators-to-a-personal-repository)," "[About collaborative development models](/articles/about-collaborative-development-models/)," or "[Collaborating with groups in organizations](/organizations/collaborating-with-groups-in-organizations/)." {% data reusables.repositories.blocked-passwords %} diff --git a/content/github/authenticating-to-github/reviewing-your-security-log.md b/content/github/authenticating-to-github/reviewing-your-security-log.md index 3878011b20..93cc9cb9e0 100644 --- a/content/github/authenticating-to-github/reviewing-your-security-log.md +++ b/content/github/authenticating-to-github/reviewing-your-security-log.md @@ -186,7 +186,6 @@ An overview of some of the most common actions that are recorded as events in th | Action | Description |------------------|------------------- -| `repo_funding_link_button_toggle` | Triggered when you enable or disable a sponsor button in your repository (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)") | `repo_funding_links_file_action` | Triggered when you change the FUNDING file in your repository (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)") | `sponsor_sponsorship_cancel` | Triggered when you cancel a sponsorship (see "[Downgrading a sponsorship](/articles/downgrading-a-sponsorship)") | `sponsor_sponsorship_create` | Triggered when you sponsor an account (see "[Sponsoring an open source contributor](/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-an-open-source-contributor)") @@ -194,9 +193,11 @@ An overview of some of the most common actions that are recorded as events in th | `sponsor_sponsorship_tier_change` | Triggered when you upgrade or downgrade your sponsorship (see "[Upgrading a sponsorship](/articles/upgrading-a-sponsorship)" and "[Downgrading a sponsorship](/articles/downgrading-a-sponsorship)") | `sponsored_developer_approve` | Triggered when your {% data variables.product.prodname_sponsors %} account is approved (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") | `sponsored_developer_create` | Triggered when your {% data variables.product.prodname_sponsors %} account is created (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") +| `sponsored_developer_disable` | Triggered when your {% data variables.product.prodname_sponsors %} account is disabled +| `sponsored_developer_redraft` | Triggered when your {% data variables.product.prodname_sponsors %} account is returned to draft state from approved state | `sponsored_developer_profile_update` | Triggered when you edit your sponsored developer profile (see "[Editing your profile details for {% data variables.product.prodname_sponsors %}](/github/supporting-the-open-source-community-with-github-sponsors/editing-your-profile-details-for-github-sponsors)") | `sponsored_developer_request_approval` | Triggered when you submit your application for {% data variables.product.prodname_sponsors %} for approval (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") -| `sponsored_developer_tier_description_update` | Triggered when you change the description for a sponsorship tier (see "[Changing your sponsorship tiers](/articles/changing-your-sponsorship-tiers)") +| `sponsored_developer_tier_description_update` | Triggered when you change the description for a sponsorship tier (see "[Managing your sponsorship tiers](/github/supporting-the-open-source-community-with-github-sponsors/managing-your-sponsorship-tiers)") | `sponsored_developer_update_newsletter_send` | Triggered when you send an email update to your sponsors (see "[Contacting your sponsors](/articles/contacting-your-sponsors)") | `waitlist_invite_sponsored_developer` | Triggered when you are invited to join {% data variables.product.prodname_sponsors %} from the waitlist (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") | `waitlist_join` | Triggered when you join the waitlist to become a sponsored developer (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)") diff --git a/content/github/collaborating-with-issues-and-pull-requests/about-conversations-on-github.md b/content/github/collaborating-with-issues-and-pull-requests/about-conversations-on-github.md index c5d427757e..056544366e 100644 --- a/content/github/collaborating-with-issues-and-pull-requests/about-conversations-on-github.md +++ b/content/github/collaborating-with-issues-and-pull-requests/about-conversations-on-github.md @@ -18,7 +18,7 @@ You can create and participate in issues, pull requests, and team discussions, d Issues are useful for discussing specific details of a project such as bug reports and planned improvements. For more information, see "[About issues](/articles/about-issues)." Pull requests allow you to comment directly on proposed changes. For more information, see "[About pull requests](/articles/about-pull-requests)" and "[Commenting on a pull request](/articles/commenting-on-a-pull-request)." -{% data reusables.organizations.team-discussions-purpose %} For more information, see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)." +{% data reusables.organizations.team-discussions-purpose %} For more information, see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)." ### Reacting to ideas in comments diff --git a/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md b/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md index 93a6a0374d..b96273574f 100644 --- a/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md +++ b/content/github/collaborating-with-issues-and-pull-requests/about-pull-request-reviews.md @@ -15,7 +15,7 @@ topics: After a pull request is opened, anyone with *read* access can review and comment on the changes it proposes. You can also suggest specific changes to lines of code, which the author can apply directly from the pull request. For more information, see "[Reviewing proposed changes in a pull request](/articles/reviewing-proposed-changes-in-a-pull-request)." -Repository owners and collaborators can request a pull request review from a specific person. Organization members can also request a pull request review from a team with read access to the repository. For more information, see "[Requesting a pull request review](/articles/requesting-a-pull-request-review)." {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %}You can specify a subset of team members to be automatically assigned in the place of the whole team. For more information, see "[Managing code review assignment for your team](/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team)."{% endif %} +Repository owners and collaborators can request a pull request review from a specific person. Organization members can also request a pull request review from a team with read access to the repository. For more information, see "[Requesting a pull request review](/articles/requesting-a-pull-request-review)." {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %}You can specify a subset of team members to be automatically assigned in the place of the whole team. For more information, see "[Managing code review assignment for your team](/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team)."{% endif %} Reviews allow for discussion of proposed changes and help ensure that the changes meet the repository's contributing guidelines and other quality standards. You can define which individuals or teams own certain types or areas of code in a CODEOWNERS file. When a pull request modifies code that has a defined owner, that individual or team will automatically be requested as a reviewer. For more information, see "[About code owners](/articles/about-code-owners/)." diff --git a/content/github/collaborating-with-issues-and-pull-requests/automatically-merging-a-pull-request.md b/content/github/collaborating-with-issues-and-pull-requests/automatically-merging-a-pull-request.md index 12d2eb2b92..137045a719 100644 --- a/content/github/collaborating-with-issues-and-pull-requests/automatically-merging-a-pull-request.md +++ b/content/github/collaborating-with-issues-and-pull-requests/automatically-merging-a-pull-request.md @@ -14,7 +14,9 @@ topics: If you enable auto-merge for a pull request, the pull request will merge automatically when all required reviews are met and status checks have passed. Auto-merge prevents you from waiting around for requirements to be met, so you can move on to other tasks. -Before you can use auto-merge with a pull request, auto-merge must be enabled for the repository. For more information, see "[Managing auto-merge for pull requests in your repository](/github/administering-a-repository/managing-auto-merge-for-pull-requests-in-your-repository)." +Before you can use auto-merge with a pull request, auto-merge must be enabled for the repository. For more information, see "[Managing auto-merge for pull requests in your repository](/github/administering-a-repository/managing-auto-merge-for-pull-requests-in-your-repository)."{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@next" or currentVersion ver_gt "enterprise-server@3.1" %} + +After you enable auto-merge for a pull request, if someone who does not have write permissions to the repository pushes new changes to the head branch or switches the base branch of the pull request, auto-merge will be disabled. For example, if a maintainer enables auto-merge for a pull request from a fork, auto-merge will be disabled after a contributor pushes new changes to the pull request.{% endif %} You can provide feedback about auto-merge by [contacting us](https://support.github.com/contact/feedback?category=prs-and-code-review&subject=Pull%20request%20auto-merge%20feedback). diff --git a/content/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review.md b/content/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review.md index 72ba7b1693..76413a4df8 100644 --- a/content/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review.md +++ b/content/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review.md @@ -13,7 +13,7 @@ topics: Owners and collaborators on a repository owned by a user account can assign pull request reviews. Organization members with triage permissions to a repository can assign a pull request review. -Owners or collaborators can assign a pull request review to any person that has been explicitly granted [read access](/articles/access-permissions-on-github) to a user-owned repository. Organization members can assign a pull request review to any person or team with read access to a repository. The requested reviewer or team will receive a notification that you asked them to review the pull request. {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %}If you request a review from a team and code review assignment is enabled, specific members will be requested and the team will be removed as a reviewer. For more information, see "[Managing code review assignment for your team](/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team)."{% endif %} +Owners or collaborators can assign a pull request review to any person that has been explicitly granted [read access](/articles/access-permissions-on-github) to a user-owned repository. Organization members can assign a pull request review to any person or team with read access to a repository. The requested reviewer or team will receive a notification that you asked them to review the pull request. {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %}If you request a review from a team and code review assignment is enabled, specific members will be requested and the team will be removed as a reviewer. For more information, see "[Managing code review assignment for your team](/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team)."{% endif %} {% note %} diff --git a/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md b/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md index 563ad76cfb..97604c7b7e 100644 --- a/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md +++ b/content/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility.md @@ -79,5 +79,5 @@ If you change the visibility of an internal repository and then delete the repos - "[Setting repository visibility](/articles/setting-repository-visibility)" - "[About forks](/articles/about-forks)" - "[Managing the forking policy for your repository](/github/administering-a-repository/managing-the-forking-policy-for-your-repository)" -- "[Managing the forking policy for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization)" +- "[Managing the forking policy for your organization](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization)" - "{% if currentVersion == "free-pro-team@latest" %}[Enforcing repository management policies in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account#enforcing-a-policy-on-forking-private-or-internal-repositories){% else %}[Enforcing repository management policies in your enterprise](/admin/policies/enforcing-repository-management-policies-in-your-enterprise#enforcing-a-policy-on-forking-private-or-internal-repositories){% endif %}" diff --git a/content/github/creating-cloning-and-archiving-repositories/about-code-owners.md b/content/github/creating-cloning-and-archiving-repositories/about-code-owners.md index c65f2577a1..f6944dd4c2 100644 --- a/content/github/creating-cloning-and-archiving-repositories/about-code-owners.md +++ b/content/github/creating-cloning-and-archiving-repositories/about-code-owners.md @@ -23,7 +23,7 @@ Code owners are automatically requested for review when someone opens a pull req When someone with admin or owner permissions has enabled required reviews, they also can optionally require approval from a code owner before the author can merge a pull request in the repository. For more information, see "[About protected branches](/github/administering-a-repository/about-protected-branches#require-pull-request-reviews-before-merging)." -{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %}If a team has enabled code review assignments, the individual approvals won't satisfy the requirement for code owner approval in a protected branch. For more information, see "[Managing code review assignment for your team](/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team)."{% endif %} +{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.19" %}If a team has enabled code review assignments, the individual approvals won't satisfy the requirement for code owner approval in a protected branch. For more information, see "[Managing code review assignment for your team](/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team)."{% endif %} {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.22" %} If a file has a code owner, you can see who the code owner is before you open a pull request. In the repository, you can browse to the file and hover over {% octicon "shield-lock" aria-label="The edit icon" %}. diff --git a/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md b/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md index 722ababce5..453fac1bfa 100644 --- a/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md +++ b/content/github/creating-cloning-and-archiving-repositories/about-repository-visibility.md @@ -21,7 +21,7 @@ Private repositories are only accessible to you, people you explicitly share acc Public repositories are accessible to everyone on the internet. Private repositories are only accessible to you, people you explicitly share access with, and, for organization repositories, certain organization members. Internal repositories are accessible to enterprise members. For more information, see "[About internal repositories](#about-internal-repositories)." {% endif %} -Organization owners always have access to every repository created in an organization. For more information, see "[Repository permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization)." +Organization owners always have access to every repository created in an organization. For more information, see "[Repository permission levels for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization)." People with admin permissions for a repository can change an existing repository's visibility. For more information, see "[Setting repository visibility](/github/administering-a-repository/setting-repository-visibility)." diff --git a/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md b/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md index 4754cfb3d8..5158be272e 100644 --- a/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md +++ b/content/github/creating-cloning-and-archiving-repositories/error-repository-not-found.md @@ -42,7 +42,7 @@ $ ssh -T git@{% data variables.command_line.codeblock %} > provide shell access. ``` -If the repository belongs to an organization and you're using an SSH key generated by an OAuth App, OAuth App access may have been restricted by an organization owner. For more information, see "About OAuth App access restrictions." +If the repository belongs to an organization and you're using an SSH key generated by an OAuth App, OAuth App access may have been restricted by an organization owner. For more information, see "About OAuth App access restrictions." For more information, see [Adding a new SSH key to your GitHub account](/articles/adding-a-new-ssh-key-to-your-github-account). diff --git a/content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio.md b/content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio.md index 084fc31a53..fb1cb2e462 100644 --- a/content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio.md +++ b/content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio.md @@ -1,6 +1,6 @@ --- title: Using Codespaces in Visual Studio -intro: 'You can develop in your codespace directly in {% data variables.product.prodname_vs %} by connecting with your account on {% data variables.product.product_name %}.' +intro: 'This preview has concluded and will no longer be accepting signups.' product: '{% data reusables.gated-features.codespaces %}' versions: free-pro-team: '*' @@ -10,57 +10,10 @@ topics: {% note %} -**Note:** {% data variables.product.prodname_codespaces %} is currently in limited public beta and subject to change. During the beta period, {% data variables.product.prodname_dotcom %} does not make any guarantees about the availability of {% data variables.product.prodname_codespaces %}. [Sign up for the limited public beta](https://github.com/features/codespaces/signup-vs). For more information about joining the beta, see "[About {% data variables.product.prodname_codespaces %}](/github/developing-online-with-codespaces/about-codespaces#joining-the-beta)." +**Note:** {% data variables.product.prodname_codespaces %} is currently in limited public beta and subject to change. During the beta period, {% data variables.product.prodname_dotcom %} does not make any guarantees about the availability of {% data variables.product.prodname_codespaces %}. {% endnote %} ### About codespaces in {% data variables.product.prodname_vs %} -You can create a codespace in {% data variables.product.prodname_vs %} to develop applications in a Windows environment. When you use a codespace in {% data variables.product.prodname_vs %}, you can browse source code, build solutions, and commit changes to your repository. - -You must create a codespace in {% data variables.product.prodname_vs %} to use it with the application. Codespaces created outside of {% data variables.product.prodname_vs %} can not currently be used with {% data variables.product.prodname_vs %}. - -### Prerequisites - -Before you configure a codespace in {% data variables.product.prodname_vs %}, you must download the latest version of [{% data variables.product.prodname_vs %} Preview](https://aka.ms/vspreview). - -#### Enabling the connection between {% data variables.product.prodname_vs %} and {% data variables.product.prodname_github_codespaces %} - -Connecting to {% data variables.product.prodname_github_codespaces %} with the {% data variables.product.prodname_vs %} Preview is not enabled by default, so you will first need to enable the Preview Features option. - -1. In {% data variables.product.prodname_vs %} Preview, use the Tools drop-down menu, then click **Options**. -2. Under **Environment**, select **Preview Features** and check the **Connect to {% data variables.product.prodname_github_codespaces %}** preview feature. - ![Check the Connect to {% data variables.product.prodname_github_codespaces %} preview feature](/assets/images/help/codespaces/connect-to-github-codespaces-preview-feature.png) -3. You will need to restart {% data variables.product.prodname_vs %} for the feature to be available. - -### Creating a codespace in {% data variables.product.prodname_vs %} - -1. When you launch {% data variables.product.prodname_vs %}, the Start Window will show a **Connect to a codespace** button under "Get started". - ![Visual Studio Start window with Connect to a codespace](/assets/images/help/codespaces/visual-studio-start-window.png) -2. Click **Connect to a codespace**. -3. Click **Sign in to {% data variables.product.prodname_dotcom %}** and follow the prompts, or click **Create one!** to create a new {% data variables.product.prodname_dotcom %} account and sign into the account. - ![Visual Studio sign in to {% data variables.product.prodname_dotcom %}](/assets/images/help/codespaces/visual-studio-sign-in-to-github.png) -4. Under "Codespace details", type the repository's URL you want {% data variables.product.prodname_github_codespaces %} to clone into your codespace. -5. Optionally, use the Instance type and Suspend after drop-down menus to configure more codespace details. - ![Visual Studio codespace details](/assets/images/help/codespaces/visual-studio-codespace-details.png) -6. Click **Create and Connect**. {% data variables.product.prodname_github_codespaces %} will begin preparing the codespace and open {% data variables.product.prodname_vs %} after the codespace is ready. The codespace name will appear in the remote indicator in the menu. - ![Visual Studio connected to eShopOnWeb repository codespace](/assets/images/help/codespaces/visual-studio-eshoponweb-codespace.png) - -### Opening a codespace in {% data variables.product.prodname_vs %} - -1. Use the File drop-down menu, and click **Connect to a Codespace**. - ![Visual Studio File Connect to a codespace menu item](/assets/images/help/codespaces/visual-studio-file-connect-to-codespace.png) -2. Under "{% data variables.product.prodname_github_codespaces %}", click the codespace you want to connect to, then click **Connect**. - ![Visual Studio displaying available codespaces and details](/assets/images/help/codespaces/visual-studio-connect-codespace.png) - -### Configuring a codespace for {% data variables.product.prodname_vs %} - -A codespace, created with {% data variables.product.prodname_vs %}, can be customized through a new tool called devinit, a command line tool included with {% data variables.product.prodname_vs %}. - -#### devinit - -[devinit](https://docs.microsoft.com/visualstudio/devinit/getting-started-with-devinit) lets you install additional frameworks and tools into your Windows development codespaces, modify environment variables, and more. - -devinit supports a configuration file called [devinit.json](https://docs.microsoft.com/visualstudio/devinit/devinit-json). You can add this file to your project if you want to create a customized and repeatable development environment. When you use devinit with a [devcontainer.json](https://docs.microsoft.com/visualstudio/ide/codespaces/customize-codespaces#running-devinit-when-creating-a-codespace) file, your codespaces will be automatically configured on creation. - -For more information about Windows codespace configuration and devinit, see [Customize a codespace](https://docs.microsoft.com/visualstudio/ide/codespaces/customize-codespaces) in the {% data variables.product.prodname_vs %} documentation. For more information about devinit, see [Getting started with devinit](https://docs.microsoft.com/visualstudio/devinit/getting-started-with-devinit). +The private preview for GitHub Codespaces in Visual Studio 2019 has concluded. For more information, see the [Visual Studio 2019 documentation](https://docs.microsoft.com/visualstudio/ide/codespaces/codespaces-overview?view=vs-2019). diff --git a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/setting-up-code-scanning-for-a-repository.md b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/setting-up-code-scanning-for-a-repository.md index 96eddbb33b..79f3e92091 100644 --- a/content/github/finding-security-vulnerabilities-and-errors-in-your-code/setting-up-code-scanning-for-a-repository.md +++ b/content/github/finding-security-vulnerabilities-and-errors-in-your-code/setting-up-code-scanning-for-a-repository.md @@ -25,7 +25,7 @@ You decide how to generate {% data variables.product.prodname_code_scanning %} a {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-security %} -3. To the right of "{% data variables.product.prodname_code_scanning_capc %} alerts", click **Set up {% data variables.product.prodname_code_scanning %}**. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}If {% data variables.product.prodname_code_scanning %} is missing, you need to ask an organization owner or repository administrator to enable {% data variables.product.prodname_GH_advanced_security %}. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)" or "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)."{% endif %} +3. To the right of "{% data variables.product.prodname_code_scanning_capc %} alerts", click **Set up {% data variables.product.prodname_code_scanning %}**. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}If {% data variables.product.prodname_code_scanning %} is missing, you need to ask an organization owner or repository administrator to enable {% data variables.product.prodname_GH_advanced_security %}. For more information, see "[Managing security and analysis settings for your organization](/organizations/collaborating-with-groups-in-organizations/managing-security-and-analysis-settings-for-your-organization)" or "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)."{% endif %} !["Set up {% data variables.product.prodname_code_scanning %}" button to the right of "{% data variables.product.prodname_code_scanning_capc %}" in the Security Overview](/assets/images/help/security/overview-set-up-code-scanning.png) 4. Under "Get started with {% data variables.product.prodname_code_scanning %}", click **Set up this workflow** on the {% data variables.product.prodname_codeql_workflow %} or on a third-party workflow. !["Set up this workflow" button under "Get started with {% data variables.product.prodname_code_scanning %}" heading](/assets/images/help/repository/code-scanning-set-up-this-workflow.png){% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}Workflows are only displayed if they are relevant for the programming languages detected in the repository. The {% data variables.product.prodname_codeql_workflow %} is always displayed, but the "Set up this workflow" button is only enabled if {% data variables.product.prodname_codeql %} analysis supports the languages present in the repository.{% endif %} diff --git a/content/github/getting-started-with-github/about-github-advanced-security.md b/content/github/getting-started-with-github/about-github-advanced-security.md index 27e3ce3e96..5b61b99b3f 100644 --- a/content/github/getting-started-with-github/about-github-advanced-security.md +++ b/content/github/getting-started-with-github/about-github-advanced-security.md @@ -37,7 +37,7 @@ For information about {% data variables.product.prodname_advanced_security %} fe The site administrator must enable {% data variables.product.prodname_advanced_security %} for {% data variables.product.product_location %} before you can use these features. For more information, see "[Configuring Advanced Security features](/admin/configuration/configuring-advanced-security-features)." {% endif %} -Once your system is set up, you can enable and disable these features at the organization or repository level. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)" and "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)." +Once your system is set up, you can enable and disable these features at the organization or repository level. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)" and "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)." {% endif %} @@ -46,7 +46,7 @@ Once your system is set up, you can enable and disable these features at the org For public repositories on {% data variables.product.prodname_dotcom_the_website %}, these features are permanently on and can only be disabled if you change the visibility of the project so that the code is no longer public. -For other repositories, once you have a license for your enterprise account, you can enable and disable these features at the organization or repository level. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)" and "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)."{% endif %} +For other repositories, once you have a license for your enterprise account, you can enable and disable these features at the organization or repository level. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)" and "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)."{% endif %} {% endif %} diff --git a/content/github/getting-started-with-github/githubs-products.md b/content/github/getting-started-with-github/githubs-products.md index 8a162bbf28..4fbb23c3f0 100644 --- a/content/github/getting-started-with-github/githubs-products.md +++ b/content/github/getting-started-with-github/githubs-products.md @@ -92,7 +92,7 @@ In addition to the features available with {% data variables.product.prodname_te - {% data variables.contact.enterprise_support %}. For more information, see "{% data variables.product.prodname_ghe_cloud %} support" and "{% data variables.product.prodname_ghe_cloud %} Addendum." - 50,000 {% data variables.product.prodname_actions %} minutes - 50GB {% data variables.product.prodname_registry %} storage -- Access control for {% data variables.product.prodname_pages %} sites. For more information, see Changing the visibility of your {% data variables.product.prodname_pages %} site" +- Access control for {% data variables.product.prodname_pages %} sites. For more information, see Changing the visibility of your {% data variables.product.prodname_pages %} site" - A service level agreement for 99.9% monthly uptime - The option to centrally manage policy and billing for multiple {% data variables.product.prodname_dotcom_the_website %} organizations with an enterprise account. For more information, see "About enterprise accounts." diff --git a/content/github/getting-started-with-github/keyboard-shortcuts.md b/content/github/getting-started-with-github/keyboard-shortcuts.md index a1a10d4bc4..4570dc23fe 100644 --- a/content/github/getting-started-with-github/keyboard-shortcuts.md +++ b/content/github/getting-started-with-github/keyboard-shortcuts.md @@ -52,6 +52,7 @@ Below is a list of some of the available keyboard shortcuts. |control z or command z | Undo |control y or command y | Redo |cmd + shift + p | Toggles between the **Edit file** and **Preview changes** tabs +|control s or command s | Write a commit message For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirror.net/doc/manual.html#commands). diff --git a/content/github/index.md b/content/github/index.md index a5c31865b4..d97b60cc5d 100644 --- a/content/github/index.md +++ b/content/github/index.md @@ -23,7 +23,7 @@ versions: {% link_in_list /managing-subscriptions-and-notifications-on-github %} -{% link_in_list /setting-up-and-managing-organizations-and-teams %} + {% link_in_list /setting-up-and-managing-your-enterprise %} {% link_in_list /setting-up-and-managing-billing-and-payments-on-github %} @@ -57,7 +57,6 @@ versions: {% link_in_list /extending-github %} -{% link_in_list /working-with-github-pages %} {% link_in_list /supporting-the-open-source-community-with-github-sponsors %} {% link_in_list /finding-talent-with-github-jobs %} {% link_in_list /working-with-github-support %} diff --git a/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md b/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md index a690af654c..f3df430d42 100644 --- a/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md +++ b/content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md @@ -42,9 +42,9 @@ For a list of the ecosystems that {% data variables.product.product_name %} can {% if currentVersion == "free-pro-team@latest" %}{% data variables.product.prodname_dotcom %} detects vulnerable dependencies in _public_ repositories and generates {% data variables.product.prodname_dependabot_alerts %} by default. Owners of private repositories, or people with admin access, can enable {% data variables.product.prodname_dependabot_alerts %} by enabling the dependency graph and {% data variables.product.prodname_dependabot_alerts %} for their repositories. -You can also enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +You can also enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/organizations/collaborating-with-groups-in-organizations/managing-security-and-analysis-settings-for-your-organization)." -For information about permission requirements for actions related to {% data variables.product.prodname_dependabot_alerts %}, see "[Repository permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization#permission-requirements-for-security-features)." +For information about permission requirements for actions related to {% data variables.product.prodname_dependabot_alerts %}, see "[Repository permission levels for an organization](/organizations/collaborating-with-groups-in-organizations/repository-permission-levels-for-an-organization#permission-requirements-for-security-features)." {% data variables.product.product_name %} starts generating the dependency graph immediately and generates alerts for any vulnerable dependencies as soon as they are identified. The graph is usually populated within minutes but this may take longer for repositories with many dependencies. For more information, see "[Managing data use settings for your private repository](/github/understanding-how-github-uses-and-protects-your-data/managing-data-use-settings-for-your-private-repository)." {% endif %} diff --git a/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md b/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md index e90aa74955..c3e58dc041 100644 --- a/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md +++ b/content/github/managing-security-vulnerabilities/configuring-notifications-for-vulnerable-dependencies.md @@ -13,7 +13,7 @@ topics: {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}When {% data variables.product.prodname_dependabot %} detects vulnerable dependencies in your repositories, we generate a {% data variables.product.prodname_dependabot %} alert and display it on the Security tab for the repository. {% data variables.product.product_name %} notifies the maintainers of affected repositories about the new alert according to their notification preferences.{% else %}When {% data variables.product.product_name %} detects vulnerable dependencies in your repositories, it sends security alerts.{% endif %}{% if currentVersion == "free-pro-team@latest" %} {% data variables.product.prodname_dependabot %} is enabled by default on all public repositories. For {% data variables.product.prodname_dependabot_alerts %}, by default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability. {% endif %} -{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-a-feature-for-all-new-repositories-when-they-are-added)." +{% if currentVersion == "free-pro-team@latest" %}If you're an organization owner, you can enable or disable {% data variables.product.prodname_dependabot_alerts %} for all repositories in your organization with one click. You can also set whether the detection of vulnerable dependencies will be enabled or disabled for newly-created repositories. For more information, see "[Managing security and analysis settings for your organization](/organizations/collaborating-with-groups-in-organizations/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-a-feature-for-all-new-repositories-when-they-are-added)." {% endif %} {% if enterpriseServerVersions contains currentVersion and currentVersion == "enterprise-server@2.21" %} diff --git a/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md b/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md index c5247ec250..23f8c2387a 100644 --- a/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md +++ b/content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md @@ -65,7 +65,7 @@ Email notifications also allow flexibility with the types of notifications you r ### About participating and watching notifications -When you watch a repository, you're subscribing to updates for activity in that repository. Similarly, when you watch a specific team's discussions, you're subscribing to all conversation updates on that team's page. For more information, see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)." +When you watch a repository, you're subscribing to updates for activity in that repository. Similarly, when you watch a specific team's discussions, you're subscribing to all conversation updates on that team's page. For more information, see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)." To see repositories that you're watching, go to your [watching page](https://github.com/watching). For more information, see "[Managing subscriptions and notifications on GitHub](/github/managing-subscriptions-and-notifications-on-github/managing-subscriptions-for-activity-on-github)." {% if currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.20" %} @@ -76,7 +76,7 @@ You can configure notifications for a repository on the repository page, or on y #### About custom notifications {% data reusables.notifications-v2.custom-notifications-beta %} You can customize notifications for a repository, for example, you can choose to only be notified when updates to one or more types of events (issues, pull request, releases, discussions) happen within a repository, or ignore all notifications for a repository. -{% endif %} For more information, see "[Viewing your subscriptions](/github/managing-subscriptions-and-notifications-on-github/viewing-your-subscriptions#configuring-your-watch-settings-for-an-individual-repository)." +{% endif %} For more information, see "[Configuring your watch settings for an individual repository](#configuring-your-watch-settings-for-an-individual-repository)" below. #### Participating in conversations Anytime you comment in a conversation or when someone @mentions your username, you are _participating_ in a conversation. By default, you are automatically subscribed to a conversation when you participate in it. You can unsubscribe from a conversation you've participated in manually by clicking **Unsubscribe** on the issue or pull request or through the **Unsubscribe** option in the notifications inbox. diff --git a/content/github/managing-subscriptions-and-notifications-on-github/viewing-your-subscriptions.md b/content/github/managing-subscriptions-and-notifications-on-github/viewing-your-subscriptions.md index bdc6a0d93b..6117a45a93 100644 --- a/content/github/managing-subscriptions-and-notifications-on-github/viewing-your-subscriptions.md +++ b/content/github/managing-subscriptions-and-notifications-on-github/viewing-your-subscriptions.md @@ -38,7 +38,7 @@ To see an overview of your repository subscriptions, see "[Reviewing repositorie {% if currentVersion == "free-pro-team@latest" %} {% tip %} -**Tip:** You can select the types of event to be notified of by using the **Custom** option of the **Watch/Unwatch** dropdown list in your [watching page](https://github.com/watching) or on any repository page on {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[Configuring your watch settings for an individual repository](#configuring-your-watch-settings-for-an-individual-repository)" below. +**Tip:** You can select the types of event to be notified of by using the **Custom** option of the **Watch/Unwatch** dropdown list in your [watching page](https://github.com/watching) or on any repository page on {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#configuring-your-watch-settings-for-an-individual-repository)." {% endtip %} {% endif %} diff --git a/content/github/setting-up-and-managing-billing-and-payments-on-github/downgrading-a-sponsorship.md b/content/github/setting-up-and-managing-billing-and-payments-on-github/downgrading-a-sponsorship.md index 55d99d1503..0028f8f221 100644 --- a/content/github/setting-up-and-managing-billing-and-payments-on-github/downgrading-a-sponsorship.md +++ b/content/github/setting-up-and-managing-billing-and-payments-on-github/downgrading-a-sponsorship.md @@ -19,15 +19,15 @@ When you downgrade or cancel a sponsorship, the change will become effective on {% data reusables.sponsors.navigate-to-sponsored-account %} {% data reusables.sponsors.sponsorship-dashboard %} +{% data reusables.sponsors.review-tiers-to-select %} {% data reusables.sponsors.select-a-tier %} {% data reusables.sponsors.update-sponsorship %} ### Canceling a sponsorship {% data reusables.user_settings.access_settings %} -{% data reusables.user_settings.billing %} +{% data reusables.user_settings.billing_plans %} {% data reusables.sponsors.billing-switcher %} -{% data reusables.user_settings.subscriptions-tab %} 3. Under "{% data variables.product.prodname_sponsors %}", to the right of the sponsored open source contributor, click {% octicon "triangle-down" aria-label="The down triangle octicon" %} next to your sponsored amount, then click **Cancel sponsorship**. ![Cancel sponsorship button](/assets/images/help/billing/edit-sponsor-billing.png) 4. Review the information about canceling your sponsorship, then click **OK**. diff --git a/content/github/setting-up-and-managing-billing-and-payments-on-github/redeeming-a-coupon.md b/content/github/setting-up-and-managing-billing-and-payments-on-github/redeeming-a-coupon.md index 038f5af655..6658057a73 100644 --- a/content/github/setting-up-and-managing-billing-and-payments-on-github/redeeming-a-coupon.md +++ b/content/github/setting-up-and-managing-billing-and-payments-on-github/redeeming-a-coupon.md @@ -14,6 +14,8 @@ topics: {% data variables.product.product_name %} can't issue a refund if you pay for an account before applying a coupon. We also can't transfer a redeemed coupon or give you a new coupon if you apply it to the wrong account. Confirm that you're applying the coupon to the correct account before you redeem a coupon. +{% data reusables.dotcom_billing.coupon-expires %} + You cannot apply coupons to paid plans for {% data variables.product.prodname_marketplace %} apps. ### Redeeming a coupon for your personal account diff --git a/content/github/setting-up-and-managing-billing-and-payments-on-github/removing-a-payment-method.md b/content/github/setting-up-and-managing-billing-and-payments-on-github/removing-a-payment-method.md index 4487393f5a..f4bd005091 100644 --- a/content/github/setting-up-and-managing-billing-and-payments-on-github/removing-a-payment-method.md +++ b/content/github/setting-up-and-managing-billing-and-payments-on-github/removing-a-payment-method.md @@ -15,6 +15,8 @@ topics: If you're paying for your {% data variables.product.product_name %} subscription with a coupon, and you aren't using your payment method for any [other paid features or products](/articles/about-billing-on-github) on {% data variables.product.product_name %}, you can remove your credit card or PayPal information. +{% data reusables.dotcom_billing.coupon-expires %} + {% tip %} **Tip:** If you [downgrade your account to a free product](/articles/downgrading-your-github-subscription) and you don't have subscriptions for any other paid features or products, we'll automatically remove your payment information. diff --git a/content/github/setting-up-and-managing-billing-and-payments-on-github/upgrading-a-sponsorship.md b/content/github/setting-up-and-managing-billing-and-payments-on-github/upgrading-a-sponsorship.md index 71d7d250f8..1f297f7e16 100644 --- a/content/github/setting-up-and-managing-billing-and-payments-on-github/upgrading-a-sponsorship.md +++ b/content/github/setting-up-and-managing-billing-and-payments-on-github/upgrading-a-sponsorship.md @@ -19,5 +19,6 @@ When you upgrade your sponsorship tier, the change will become effective immedia {% data reusables.sponsors.navigate-to-sponsored-account %} {% data reusables.sponsors.sponsorship-dashboard %} +{% data reusables.sponsors.review-tiers-to-select %} {% data reusables.sponsors.select-a-tier %} {% data reusables.sponsors.update-sponsorship %} diff --git a/content/github/setting-up-and-managing-billing-and-payments-on-github/upgrading-your-github-subscription.md b/content/github/setting-up-and-managing-billing-and-payments-on-github/upgrading-your-github-subscription.md index 848bdc0cf1..cf968f72ed 100644 --- a/content/github/setting-up-and-managing-billing-and-payments-on-github/upgrading-your-github-subscription.md +++ b/content/github/setting-up-and-managing-billing-and-payments-on-github/upgrading-your-github-subscription.md @@ -58,7 +58,7 @@ You can upgrade your organization from {% data variables.product.prodname_free_t #### Next steps for organizations using {% data variables.product.prodname_ghe_cloud %} -If you upgraded your organization to {% data variables.product.prodname_ghe_cloud %}, you can set up identity and access management for your organization. For more information, see "[Managing SAML single sign-on for your organization](/articles/managing-saml-single-sign-on-for-your-organization)." +If you upgraded your organization to {% data variables.product.prodname_ghe_cloud %}, you can set up identity and access management for your organization. For more information, see "[Managing SAML single sign-on for your organization](/organizations/managing-saml-single-sign-on-for-your-organization)." If you'd like to use an enterprise account with {% data variables.product.prodname_ghe_cloud %}, contact {% data variables.contact.contact_enterprise_sales %}. For more information, see "[About enterprise accounts](/articles/about-enterprise-accounts)." diff --git a/content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-advanced-security-usage.md b/content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-advanced-security-usage.md index 3e9d1d052a..d4c7b9fea7 100644 --- a/content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-advanced-security-usage.md +++ b/content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-advanced-security-usage.md @@ -29,5 +29,5 @@ You can check how many seats your license includes and how many of them are curr ![Owned organization in {% data variables.product.prodname_GH_advanced_security %} section of enterprise billing settings](/assets/images/help/billing/ghas-orgs-list-enterprise-click-org.png) 6. On the "Security & analysis" settings page, scroll to the "{% data variables.product.prodname_GH_advanced_security %} repositories" section to see a detailed breakdown of usage by repository for this organization. ![{% data variables.product.prodname_GH_advanced_security %} repositories section](/assets/images/help/enterprises/settings-security-analysis-ghas-repos-list.png) - For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." + For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." diff --git a/content/github/setting-up-and-managing-organizations-and-teams/collaborating-with-groups-in-organizations.md b/content/github/setting-up-and-managing-organizations-and-teams/collaborating-with-groups-in-organizations.md deleted file mode 100644 index 6e4d1b4eed..0000000000 --- a/content/github/setting-up-and-managing-organizations-and-teams/collaborating-with-groups-in-organizations.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -title: Collaborating with groups in organizations -intro: Groups of people can collaborate across many projects at the same time in organization accounts. -redirect_from: - - /articles/creating-a-new-organization-account/ - - /articles/collaborating-with-groups-in-organizations -mapTopic: true -versions: - free-pro-team: '*' - enterprise-server: '*' - github-ae: '*' -topics: - - organizations - - teams ---- - diff --git a/content/github/setting-up-and-managing-organizations-and-teams/index.md b/content/github/setting-up-and-managing-organizations-and-teams/index.md deleted file mode 100644 index 70a9607bb9..0000000000 --- a/content/github/setting-up-and-managing-organizations-and-teams/index.md +++ /dev/null @@ -1,145 +0,0 @@ ---- -title: Setting up and managing organizations and teams -shortTitle: Organizations and teams -intro: Collaborate across many projects while managing access to projects and data and customizing settings for your organization. -redirect_from: - - /articles/about-improved-organization-permissions/ - - /categories/setting-up-and-managing-organizations-and-teams -versions: - free-pro-team: '*' - enterprise-server: '*' - github-ae: '*' -topics: - - organizations - - teams ---- - - -### Table of Contents - -{% topic_link_in_list /collaborating-with-groups-in-organizations %} - {% link_in_list /about-organizations %} - {% link_in_list /about-your-organization-dashboard %} - {% link_in_list /creating-a-new-organization-from-scratch %} - {% link_in_list /accessing-your-organizations-settings %} - {% link_in_list /about-your-organizations-news-feed %} - {% link_in_list /viewing-insights-for-your-organization %} -{% topic_link_in_list /managing-membership-in-your-organization %} - {% link_in_list /inviting-users-to-join-your-organization %} - {% link_in_list /canceling-or-editing-an-invitation-to-join-your-organization %} - - {% link_in_list /adding-people-to-your-organization %} - {% link_in_list /removing-a-member-from-your-organization %} - {% link_in_list /reinstating-a-former-member-of-your-organization %} - {% link_in_list /can-i-create-accounts-for-people-in-my-organization %} -{% topic_link_in_list /managing-peoples-access-to-your-organization-with-roles %} - {% link_in_list /permission-levels-for-an-organization %} - {% link_in_list /maintaining-ownership-continuity-for-your-organization %} - {% link_in_list /giving-team-maintainer-permissions-to-an-organization-member %} - {% link_in_list /adding-a-billing-manager-to-your-organization %} - {% link_in_list /removing-a-billing-manager-from-your-organization %} -{% topic_link_in_list /organizing-members-into-teams %} - {% link_in_list /about-teams %} - {% link_in_list /creating-a-team %} - {% link_in_list /setting-your-teams-profile-picture %} - {% link_in_list /adding-organization-members-to-a-team %} - {% link_in_list /managing-code-review-assignment-for-your-team %} - {% link_in_list /renaming-a-team %} - {% link_in_list /changing-team-visibility %} - {% link_in_list /synchronizing-a-team-with-an-identity-provider-group %} - {% link_in_list /moving-a-team-in-your-organizations-hierarchy %} - {% link_in_list /requesting-to-add-a-child-team %} - {% link_in_list /requesting-to-add-or-change-a-parent-team %} - {% link_in_list /removing-organization-members-from-a-team %} - {% link_in_list /disabling-team-discussions-for-your-organization %} - {% link_in_list /managing-scheduled-reminders-for-your-team %} - {% link_in_list /deleting-a-team %} -{% topic_link_in_list /collaborating-with-your-team %} - {% link_in_list /about-team-discussions %} - {% link_in_list /creating-a-team-discussion %} - {% link_in_list /editing-or-deleting-a-team-discussion %} - {% link_in_list /pinning-a-team-discussion %} -{% topic_link_in_list /managing-access-to-your-organizations-repositories %} - {% link_in_list /repository-permission-levels-for-an-organization %} - {% link_in_list /setting-base-permissions-for-an-organization %} - {% link_in_list /viewing-people-with-access-to-your-repository %} - {% link_in_list /managing-an-individuals-access-to-an-organization-repository %} - {% link_in_list /managing-team-access-to-an-organization-repository %} - {% link_in_list /adding-outside-collaborators-to-repositories-in-your-organization %} - {% link_in_list /canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization %} - {% link_in_list /removing-an-outside-collaborator-from-an-organization-repository %} - {% link_in_list /converting-an-organization-member-to-an-outside-collaborator %} - {% link_in_list /converting-an-outside-collaborator-to-an-organization-member %} - {% link_in_list /reinstating-a-former-outside-collaborators-access-to-your-organization %} -{% topic_link_in_list /managing-access-to-your-organizations-project-boards %} - {% link_in_list /project-board-permissions-for-an-organization %} - {% link_in_list /managing-access-to-a-project-board-for-organization-members %} - {% link_in_list /managing-team-access-to-an-organization-project-board %} - {% link_in_list /managing-an-individuals-access-to-an-organization-project-board %} - {% link_in_list /adding-an-outside-collaborator-to-a-project-board-in-your-organization %} - {% link_in_list /removing-an-outside-collaborator-from-an-organization-project-board %} -{% topic_link_in_list /managing-access-to-your-organizations-apps %} - {% link_in_list /adding-github-app-managers-in-your-organization %} - {% link_in_list /removing-github-app-managers-from-your-organization %} -{% topic_link_in_list /managing-organization-settings %} - {% link_in_list /verifying-your-organizations-domain %} - {% link_in_list /renaming-an-organization %} - {% link_in_list /transferring-organization-ownership %} - {% link_in_list /restricting-repository-creation-in-your-organization %} - {% link_in_list /setting-permissions-for-deleting-or-transferring-repositories %} - {% link_in_list /restricting-repository-visibility-changes-in-your-organization %} - {% link_in_list /managing-the-forking-policy-for-your-organization %} - {% link_in_list /disabling-or-limiting-github-actions-for-your-organization %} - {% link_in_list /configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization %} - {% link_in_list /setting-permissions-for-adding-outside-collaborators %} - {% link_in_list /allowing-people-to-delete-issues-in-your-organization %}{% if currentVersion == "free-pro-team@latest" %} - {% link_in_list /managing-discussion-creation-for-repositories-in-your-organization %}{% endif %} - {% link_in_list /setting-team-creation-permissions-in-your-organization %} - {% link_in_list /managing-scheduled-reminders-for-your-organization %} - {% link_in_list /managing-the-default-branch-name-for-repositories-in-your-organization %} - {% link_in_list /managing-default-labels-for-repositories-in-your-organization %} - {% link_in_list /changing-the-visibility-of-your-organizations-dependency-insights %} - {% link_in_list /managing-the-display-of-member-names-in-your-organization %} - {% link_in_list /managing-updates-from-accounts-your-organization-sponsors %} - {% link_in_list /managing-the-publication-of-github-pages-sites-for-your-organization %} - {% link_in_list /deleting-an-organization-account %} - {% link_in_list /converting-an-organization-into-a-user %} - {% link_in_list /integrating-jira-with-your-organization-project-board %} - {% link_in_list /upgrading-to-the-corporate-terms-of-service %} -{% topic_link_in_list /migrating-to-improved-organization-permissions %} - {% link_in_list /converting-an-owners-team-to-improved-organization-permissions %} - {% link_in_list /converting-an-admin-team-to-improved-organization-permissions %} - {% link_in_list /migrating-admin-teams-to-improved-organization-permissions %} -{% topic_link_in_list /restricting-access-to-your-organizations-data %} - {% link_in_list /about-oauth-app-access-restrictions %} - {% link_in_list /enabling-oauth-app-access-restrictions-for-your-organization %} - {% link_in_list /disabling-oauth-app-access-restrictions-for-your-organization %} - {% link_in_list /approving-oauth-apps-for-your-organization %} - {% link_in_list /denying-access-to-a-previously-approved-oauth-app-for-your-organization %} -{% topic_link_in_list /keeping-your-organization-secure %} - {% link_in_list /viewing-whether-users-in-your-organization-have-2fa-enabled %} - {% link_in_list /preparing-to-require-two-factor-authentication-in-your-organization %} - {% link_in_list /requiring-two-factor-authentication-in-your-organization %} - {% link_in_list /managing-security-and-analysis-settings-for-your-organization %} - {% link_in_list /managing-allowed-ip-addresses-for-your-organization %} - {% link_in_list /restricting-email-notifications-to-an-approved-domain %} - {% link_in_list /reviewing-the-audit-log-for-your-organization %} - {% link_in_list /reviewing-your-organizations-installed-integrations %} -{% topic_link_in_list /managing-saml-single-sign-on-for-your-organization %} - {% link_in_list /about-identity-and-access-management-with-saml-single-sign-on %} - {% link_in_list /about-scim %} - {% link_in_list /connecting-your-identity-provider-to-your-organization %} - {% link_in_list /configuring-saml-single-sign-on-and-scim-using-okta %} - {% link_in_list /enabling-and-testing-saml-single-sign-on-for-your-organization %} - {% link_in_list /preparing-to-enforce-saml-single-sign-on-in-your-organization %} - {% link_in_list /enforcing-saml-single-sign-on-for-your-organization %} - {% link_in_list /downloading-your-organizations-saml-single-sign-on-recovery-codes %} - {% link_in_list /managing-team-synchronization-for-your-organization %} - {% link_in_list /accessing-your-organization-if-your-identity-provider-is-unavailable %} -{% topic_link_in_list /granting-access-to-your-organization-with-saml-single-sign-on %} - {% link_in_list /managing-bots-and-service-accounts-with-saml-single-sign-on %} - {% link_in_list /viewing-and-managing-a-members-saml-access-to-your-organization %} - {% link_in_list /about-two-factor-authentication-and-saml-single-sign-on %} -{% topic_link_in_list /managing-git-access-to-your-organizations-repositories %} - {% link_in_list /about-ssh-certificate-authorities %} - {% link_in_list /managing-your-organizations-ssh-certificate-authorities %} diff --git a/content/github/setting-up-and-managing-organizations-and-teams/keeping-your-organization-secure.md b/content/github/setting-up-and-managing-organizations-and-teams/keeping-your-organization-secure.md deleted file mode 100644 index 62b65b07ce..0000000000 --- a/content/github/setting-up-and-managing-organizations-and-teams/keeping-your-organization-secure.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -title: Keeping your organization secure -redirect_from: - - /articles/preventing-unauthorized-access-to-organization-information/ - - /articles/keeping-your-organization-secure -intro: 'Organization owners have several features to help them keep their projects and data secure. If you''re the owner of an organization, you should regularly review your organization''s audit log{% if currentVersion != "github-ae@latest" %}, member 2FA status,{% endif %} and application settings to ensure that no unauthorized or malicious activity has occurred.' -mapTopic: true -versions: - free-pro-team: '*' - enterprise-server: '*' - github-ae: '*' -topics: - - organizations - - teams ---- - diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-project-boards.md b/content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-project-boards.md deleted file mode 100644 index 2bdeee3631..0000000000 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-project-boards.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -title: Managing access to your organization’s project boards -intro: 'As an organization owner or project board admin, you can give organization members, teams, and outside collaborators different levels of access to project boards owned by your organization.' -redirect_from: - - /articles/managing-access-to-your-organization-s-project-boards - - /articles/managing-access-to-your-organizations-project-boards -mapTopic: true -versions: - free-pro-team: '*' - enterprise-server: '*' - github-ae: '*' -topics: - - organizations - - teams ---- - diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-repositories.md b/content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-repositories.md deleted file mode 100644 index ed1fe22a09..0000000000 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-repositories.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -title: Managing access to your organization's repositories -intro: Organization owners can manage individual and team access to the organization's repositories. Team maintainers can also manage a team's repository access. -redirect_from: - - /articles/permission-levels-for-an-organization-repository/ - - /articles/managing-access-to-your-organization-s-repositories - - /articles/managing-access-to-your-organizations-repositories -mapTopic: true -versions: - free-pro-team: '*' - enterprise-server: '*' - github-ae: '*' -topics: - - organizations - - teams ---- - diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-organization-settings.md b/content/github/setting-up-and-managing-organizations-and-teams/managing-organization-settings.md deleted file mode 100644 index 64b002f6bf..0000000000 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-organization-settings.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -title: Managing organization settings -intro: 'Organization administrators can change several settings, including the names of repositories that belong to the organization and Owners team membership. In addition, organization admins can delete the organization and all of its repositories.' -mapTopic: true -redirect_from: - - /articles/managing-organization-settings -versions: - free-pro-team: '*' - enterprise-server: '*' - github-ae: '*' -topics: - - organizations - - teams ---- - diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-saml-single-sign-on-for-your-organization.md b/content/github/setting-up-and-managing-organizations-and-teams/managing-saml-single-sign-on-for-your-organization.md deleted file mode 100644 index f39fa938c3..0000000000 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-saml-single-sign-on-for-your-organization.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -title: Managing SAML single sign-on for your organization -intro: Organization administrators can manage organization members' identities and access to the organization with SAML single sign-on (SSO). -mapTopic: true -redirect_from: - - /articles/managing-member-identity-and-access-in-your-organization-with-saml-single-sign-on/ - - /articles/managing-saml-single-sign-on-for-your-organization -versions: - free-pro-team: '*' -topics: - - organizations - - teams ---- - diff --git a/content/github/setting-up-and-managing-organizations-and-teams/organizing-members-into-teams.md b/content/github/setting-up-and-managing-organizations-and-teams/organizing-members-into-teams.md deleted file mode 100644 index b820de8bd8..0000000000 --- a/content/github/setting-up-and-managing-organizations-and-teams/organizing-members-into-teams.md +++ /dev/null @@ -1,23 +0,0 @@ ---- -title: Organizing members into teams -intro: You can group organization members into teams that reflect your company or group's structure with cascading access permissions and mentions. -redirect_from: - - /articles/setting-up-teams-improved-organization-permissions/ - - /articles/setting-up-teams-for-accessing-organization-repositories/ - - /articles/creating-teams/ - - /articles/adding-people-to-teams-in-an-organization/ - - /articles/removing-a-member-from-a-team-in-your-organization/ - - /articles/setting-up-teams/ - - /articles/maintaining-teams-improved-organization-permissions/ - - /articles/maintaining-teams/ - - /articles/organizing-members-into-teams -mapTopic: true -versions: - free-pro-team: '*' - enterprise-server: '*' - github-ae: '*' -topics: - - organizations - - teams ---- - diff --git a/content/github/setting-up-and-managing-your-enterprise/enabling-saml-single-sign-on-for-organizations-in-your-enterprise-account.md b/content/github/setting-up-and-managing-your-enterprise/enabling-saml-single-sign-on-for-organizations-in-your-enterprise-account.md index 4743ba484e..f41af1c1b1 100644 --- a/content/github/setting-up-and-managing-your-enterprise/enabling-saml-single-sign-on-for-organizations-in-your-enterprise-account.md +++ b/content/github/setting-up-and-managing-your-enterprise/enabling-saml-single-sign-on-for-organizations-in-your-enterprise-account.md @@ -11,7 +11,7 @@ topics: ### About SAML single sign-on for enterprise accounts -{% data reusables.saml.dotcom-saml-explanation %} For more information, see "[About identity and access management with SAML single sign-on](/github/setting-up-and-managing-organizations-and-teams/about-identity-and-access-management-with-saml-single-sign-on)." +{% data reusables.saml.dotcom-saml-explanation %} For more information, see "[About identity and access management with SAML single sign-on](/organizations/managing-saml-single-sign-on-for-your-organization/about-identity-and-access-management-with-saml-single-sign-on)." {% data reusables.saml.about-saml-enterprise-accounts %} diff --git a/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md b/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md index 8271ab0077..c3b98b6c68 100644 --- a/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md +++ b/content/github/setting-up-and-managing-your-enterprise/enforcing-security-settings-in-your-enterprise-account.md @@ -51,7 +51,7 @@ Enterprise owners can restrict access to assets owned by organizations in an ent {% data reusables.identity-and-permissions.ip-allow-lists-enable %} -You can also configure allowed IP addresses for an individual organization. For more information, see "[Managing allowed IP addresses for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization)." +You can also configure allowed IP addresses for an individual organization. For more information, see "[Managing allowed IP addresses for your organization](/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization)." #### Adding an allowed IP address diff --git a/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md b/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md index cbe70eef28..5ad2d70c34 100644 --- a/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md +++ b/content/github/setting-up-and-managing-your-enterprise/enforcing-team-policies-in-your-enterprise-account.md @@ -15,7 +15,7 @@ topics: ### Enforcing a policy for team discussions -Across all organizations owned by your enterprise account, you can enable or disable team discussions, or allow owners to administer the setting on the organization level. For more information, see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions/)." +Across all organizations owned by your enterprise account, you can enable or disable team discussions, or allow owners to administer the setting on the organization level. For more information, see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions/)." {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.policies-tab %} diff --git a/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md b/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md index 6596a04d44..6b98fa4dff 100644 --- a/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md +++ b/content/github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise.md @@ -39,7 +39,7 @@ Organization owners can invite new members to an organization by email address. While not required, we recommend that organization owners send an invitation to the same email address used for the {% data variables.product.prodname_vs %} subscriber's User Primary Name (UPN). When the email address on {% data variables.product.product_name %} matches the subscriber's UPN, you can ensure that another member of the organization does not claim the subscriber's license. -For more information, see "[Inviting users to join your organization](/github/setting-up-and-managing-organizations-and-teams/inviting-users-to-join-your-organization)," "[Signing up for {% data variables.product.prodname_dotcom %}](/github/getting-started-with-github/signing-up-for-github)," and "[Managing email preferences](/github/setting-up-and-managing-your-github-user-account/managing-email-preferences)." +For more information, see "[Inviting users to join your organization](/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization)," "[Signing up for {% data variables.product.prodname_dotcom %}](/github/getting-started-with-github/signing-up-for-github)," and "[Managing email preferences](/github/setting-up-and-managing-your-github-user-account/managing-email-preferences)." ### Viewing {% data variables.product.prodname_enterprise %} licensing diff --git a/content/github/setting-up-and-managing-your-enterprise/managing-team-synchronization-for-organizations-in-your-enterprise-account.md b/content/github/setting-up-and-managing-your-enterprise/managing-team-synchronization-for-organizations-in-your-enterprise-account.md index ef3f0b988a..7c5e14291d 100644 --- a/content/github/setting-up-and-managing-your-enterprise/managing-team-synchronization-for-organizations-in-your-enterprise-account.md +++ b/content/github/setting-up-and-managing-your-enterprise/managing-team-synchronization-for-organizations-in-your-enterprise-account.md @@ -19,7 +19,7 @@ If you use Azure AD as your IdP, you can enable team synchronization for your en {% data reusables.identity-and-permissions.team-sync-disable %} -You can also configure and manage team synchronization for an individual organization. For more information, see "[Managing team synchronization for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-team-synchronization-for-your-organization)." +You can also configure and manage team synchronization for an individual organization. For more information, see "[Managing team synchronization for your organization](/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization)." ### Prerequisites diff --git a/content/github/setting-up-and-managing-your-enterprise/restricting-email-notifications-for-your-enterprise-account-to-approved-domains.md b/content/github/setting-up-and-managing-your-enterprise/restricting-email-notifications-for-your-enterprise-account-to-approved-domains.md index 651e15af7b..3a60254b42 100644 --- a/content/github/setting-up-and-managing-your-enterprise/restricting-email-notifications-for-your-enterprise-account-to-approved-domains.md +++ b/content/github/setting-up-and-managing-your-enterprise/restricting-email-notifications-for-your-enterprise-account-to-approved-domains.md @@ -11,7 +11,7 @@ topics: ### About email restrictions for your enterprise account -When you restrict email notifications to verified domains, enterprise members can only use an email address associated with a verified domain to receive email notifications about activity in organizations owned by your enterprise account. The domains can be inherited from the enterprise account or configured for the specific organization. For more information about email restrictions for organizations, see "[Restricting email notifications to an approved domain](/github/setting-up-and-managing-organizations-and-teams/restricting-email-notifications-to-an-approved-domain)." +When you restrict email notifications to verified domains, enterprise members can only use an email address associated with a verified domain to receive email notifications about activity in organizations owned by your enterprise account. The domains can be inherited from the enterprise account or configured for the specific organization. For more information about email restrictions for organizations, see "[Restricting email notifications to an approved domain](/organizations/keeping-your-organization-secure/restricting-email-notifications-to-an-approved-domain)." If email restrictions are enabled for an enterprise account, organization owners cannot disable email restrictions for any organization owned by the enterprise account. If changes occur that result in an organization having no verified domains, either inherited from an enterprise account that owns the organization or for the specific organization, email restrictions will be disabled for the organization. diff --git a/content/github/setting-up-and-managing-your-enterprise/verifying-your-enterprise-accounts-domain.md b/content/github/setting-up-and-managing-your-enterprise/verifying-your-enterprise-accounts-domain.md index 96714ca44c..0baf3c1664 100644 --- a/content/github/setting-up-and-managing-your-enterprise/verifying-your-enterprise-accounts-domain.md +++ b/content/github/setting-up-and-managing-your-enterprise/verifying-your-enterprise-accounts-domain.md @@ -14,7 +14,7 @@ topics: ### About domain verification -You can confirm that the websites and email addresses listed on the profiles of any organization owned by your enterprise account are controlled by your enterprise by verifying the domains. Verified domains for an enterprise account apply to every organization owned by the enterprise account, and organization owners can verify additional domains for their organizations. For more information, see "[Verifying your organization's domain](/github/setting-up-and-managing-organizations-and-teams/verifying-your-organizations-domain)." +You can confirm that the websites and email addresses listed on the profiles of any organization owned by your enterprise account are controlled by your enterprise by verifying the domains. Verified domains for an enterprise account apply to every organization owned by the enterprise account, and organization owners can verify additional domains for their organizations. For more information, see "[Verifying your organization's domain](/organizations/managing-organization-settings/verifying-your-organizations-domain)." After you verify ownership of your enterprise account's domains, a "Verified" badge will display on the profile of each organization that has the domain listed on its profile. {% data reusables.organizations.verified-domains-details %} @@ -22,7 +22,7 @@ Organization owners will be able to verify the identity of organization members After you verify domains for your enterprise account, you can restrict email notifications to verified domains for all the organizations owned by your enterprise account. For more information, see "[Restricting email notifications for your enterprise account to approved domains](/github/setting-up-and-managing-your-enterprise/restricting-email-notifications-for-your-enterprise-account-to-approved-domains)." -Even if you don't restrict email notifications for the enterprise account, if an organization owner has restricted email notifications for the organization, organization members will be able to receive notifications from any domains verified for the enterprise account, in addition to any domains verified for the organization. For more information about restricting notifications for an organization, see "[Restricting email notifications to an approved domain](/github/setting-up-and-managing-organizations-and-teams/restricting-email-notifications-to-an-approved-domain)." +Even if you don't restrict email notifications for the enterprise account, if an organization owner has restricted email notifications for the organization, organization members will be able to receive notifications from any domains verified for the enterprise account, in addition to any domains verified for the organization. For more information about restricting notifications for an organization, see "[Restricting email notifications to an approved domain](/organizations/keeping-your-organization-secure/restricting-email-notifications-to-an-approved-domain)." ### Verifying your enterprise account's domain diff --git a/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md b/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md index 79372cb903..fceae001bb 100644 --- a/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md +++ b/content/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise.md @@ -53,4 +53,4 @@ When you enable SAML single sign-on for your enterprise account, each enterprise ### Further reading -- "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization)" +- "[Viewing and managing a member's SAML access to your organization](/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization)" diff --git a/content/github/setting-up-and-managing-your-github-profile/about-your-organizations-profile.md b/content/github/setting-up-and-managing-your-github-profile/about-your-organizations-profile.md index 0a158f8e14..14c6d1b4f4 100644 --- a/content/github/setting-up-and-managing-your-github-profile/about-your-organizations-profile.md +++ b/content/github/setting-up-and-managing-your-github-profile/about-your-organizations-profile.md @@ -14,7 +14,7 @@ topics: You can optionally choose to add a description, location, website, and email address for your organization, and pin important repositories to the top of the page. -{% if currentVersion == "free-pro-team@latest" %}To confirm your organization's identity and display a "Verified" badge on your organization profile page, you must verify your organization's domains with {% data variables.product.product_name %}. For more information, see "[Verifying your organization's domain](/github/setting-up-and-managing-organizations-and-teams/verifying-your-organizations-domain)." +{% if currentVersion == "free-pro-team@latest" %}To confirm your organization's identity and display a "Verified" badge on your organization profile page, you must verify your organization's domains with {% data variables.product.product_name %}. For more information, see "[Verifying your organization's domain](/organizations/managing-organization-settings/verifying-your-organizations-domain)." ![Sample verified organization profile page](/assets/images/help/profile/org_profile_verified.png) {% else %} @@ -23,4 +23,4 @@ You can optionally choose to add a description, location, website, and email add ### Further reading -- "[About organizations](/github/setting-up-and-managing-organizations-and-teams/about-organizations)" +- "[About organizations](/organizations/collaborating-with-groups-in-organizations/about-organizations)" diff --git a/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md b/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md index 84d3bddd57..84fe6acd47 100644 --- a/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md +++ b/content/github/setting-up-and-managing-your-github-profile/why-are-my-contributions-not-showing-up-on-my-profile.md @@ -25,7 +25,7 @@ Commits will appear on your contributions graph if they meet **all** of the foll - In the repository's default branch - In the `gh-pages` branch (for repositories with project sites) -For more information on project sites, see "[About {% data variables.product.prodname_pages %}](/github/working-with-github-pages/about-github-pages#types-of-github-pages-sites)." +For more information on project sites, see "[About {% data variables.product.prodname_pages %}](/pages/getting-started-with-github-pages/about-github-pages#types-of-github-pages-sites)." In addition, **at least one** of the following must be true: - You are a collaborator on the repository or are a member of the organization that owns the repository. @@ -66,7 +66,7 @@ Generic email addresses--such as `jane@computer.local`--cannot be added to {% da #### Commit was not made in the default or `gh-pages` branch -Commits are only counted if they are made in the default branch or the `gh-pages` branch (for repositories with project sites). For more information, see "[About {% data variables.product.prodname_pages %}](/github/working-with-github-pages/about-github-pages#types-of-github-pages-sites)." +Commits are only counted if they are made in the default branch or the `gh-pages` branch (for repositories with project sites). For more information, see "[About {% data variables.product.prodname_pages %}](/pages/getting-started-with-github-pages/about-github-pages#types-of-github-pages-sites)." If your commits are in a non-default or non-`gh-pages` branch and you'd like them to count toward your contributions, you will need to do one of the following: - [Open a pull request](/articles/creating-a-pull-request) to have your changes merged into the default branch or the `gh-pages` branch. diff --git a/content/github/setting-up-and-managing-your-github-user-account/converting-a-user-into-an-organization.md b/content/github/setting-up-and-managing-your-github-user-account/converting-a-user-into-an-organization.md index 73250f620d..7f6721362f 100644 --- a/content/github/setting-up-and-managing-your-github-user-account/converting-a-user-into-an-organization.md +++ b/content/github/setting-up-and-managing-your-github-user-account/converting-a-user-into-an-organization.md @@ -55,7 +55,7 @@ You can also convert your personal user account directly into an organization. C {% tip %} -**Tip**: When you convert a user account into an organization, we'll add collaborators on repositories that belong to the account to the new organization as *outside collaborators*. You can then invite *outside collaborators* to become members of your new organization if you wish. For more information, see "[Permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization#outside-collaborators)." +**Tip**: When you convert a user account into an organization, we'll add collaborators on repositories that belong to the account to the new organization as *outside collaborators*. You can then invite *outside collaborators* to become members of your new organization if you wish. For more information, see "[Permission levels for an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/permission-levels-for-an-organization#outside-collaborators)." {% endtip %} diff --git a/content/github/setting-up-and-managing-your-github-user-account/inviting-collaborators-to-a-personal-repository.md b/content/github/setting-up-and-managing-your-github-user-account/inviting-collaborators-to-a-personal-repository.md index ce6539cb9d..aabf30b994 100644 --- a/content/github/setting-up-and-managing-your-github-user-account/inviting-collaborators-to-a-personal-repository.md +++ b/content/github/setting-up-and-managing-your-github-user-account/inviting-collaborators-to-a-personal-repository.md @@ -60,4 +60,4 @@ Repositories owned by an organization can grant more granular access. For more i - "[Permission levels for a user account repository](/articles/permission-levels-for-a-user-account-repository/#collaborator-access-for-a-repository-owned-by-a-user-account)" - "[Removing a collaborator from a personal repository](/articles/removing-a-collaborator-from-a-personal-repository)" - "[Removing yourself from a collaborator's repository](/articles/removing-yourself-from-a-collaborator-s-repository)" -- "[Organizing members into teams](/articles/organizing-members-into-teams)" +- "[Organizing members into teams](/organizations/organizing-members-into-teams)" diff --git a/content/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories.md b/content/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories.md index b199768a7b..e69c10b10b 100644 --- a/content/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories.md +++ b/content/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories.md @@ -28,4 +28,4 @@ When you create a new repository on {% data variables.product.product_location % ### Further reading -- "[Managing the default branch name for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)" +- "[Managing the default branch name for repositories in your organization](/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization)" diff --git a/content/github/setting-up-and-managing-your-github-user-account/managing-your-scheduled-reminders.md b/content/github/setting-up-and-managing-your-github-user-account/managing-your-scheduled-reminders.md index 2284aaf647..b4fc8c5a9c 100644 --- a/content/github/setting-up-and-managing-your-github-user-account/managing-your-scheduled-reminders.md +++ b/content/github/setting-up-and-managing-your-github-user-account/managing-your-scheduled-reminders.md @@ -13,7 +13,7 @@ Scheduled reminders are used to make sure that users focus on the most important For certain events, you can also enable real-time alerts for scheduled reminders. Real-time alerts get sent to your Slack channel as soon as an important event, such as when you are assigned a review, takes place. -You can set scheduled reminders for personal or team-level review requests for pull requests in organizations you are a member of. Before you can create a scheduled reminder for yourself, an organization owner must authorize your Slack workspace. For more information, see "[Managing scheduled reminders for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-organization)." +You can set scheduled reminders for personal or team-level review requests for pull requests in organizations you are a member of. Before you can create a scheduled reminder for yourself, an organization owner must authorize your Slack workspace. For more information, see "[Managing scheduled reminders for your organization](/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization)." {% data reusables.reminders.scheduled-reminders-limitations %} @@ -55,5 +55,5 @@ You can set scheduled reminders for personal or team-level review requests for p ### Further reading -- "[Managing scheduled reminders for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-organization)" -- "[Managing scheduled reminders for your team](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-team)" +- "[Managing scheduled reminders for your organization](/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization)" +- "[Managing scheduled reminders for your team](/organizations/organizing-members-into-teams/managing-scheduled-reminders-for-your-team)" diff --git a/content/github/site-policy/github-corporate-terms-of-service.md b/content/github/site-policy/github-corporate-terms-of-service.md index da405f50f0..abcec76772 100644 --- a/content/github/site-policy/github-corporate-terms-of-service.md +++ b/content/github/site-policy/github-corporate-terms-of-service.md @@ -126,7 +126,7 @@ Customer’s use of the Products must not violate any applicable laws, including Customer’s use of the Service must comply with [GitHub's Acceptable Use Policies](/articles/github-acceptable-use-policies) and [GitHub’s Community Guidelines](/articles/github-community-guidelines). Customer must not use the Service in any jurisdiction for unlawful, obscene, offensive or fraudulent Content or activity, such as advocating or causing harm, interfering with or violating the integrity or security of a network or system, evading filters, sending unsolicited, abusive, or deceptive messages, viruses or harmful code, or violating third party rights. #### 3. Privacy -The [GitHub Privacy Statement](/articles/github-privacy-statement) and the [GitHub Data Protection Addendum](/github/site-policy/github-data-protection-addendum) provide detailed notice of GitHub's privacy and data use practices as well as GitHub's processing and security obligations with respect to Customer Personal Data. Any person, entity, or service collecting data from the Service must comply with the GitHub Privacy Statement, particularly in regards to the collection of Users' Personal Information (as defined in the GitHub Privacy Statement). If Customer collects any User Personal Information from GitHub, Customer will only use it for the purpose for which the External User has authorized it. Customer will reasonably secure any such Personal Information, and Customer will respond promptly to complaints, removal requests, and "do not contact" requests from GitHub or External Users. +The [GitHub Privacy Statement](/articles/github-privacy-statement) and the [GitHub Data Protection Agreement](/github/site-policy/github-data-protection-agreement-non-enterprise-customers) provide detailed notice of GitHub's privacy and data use practices as well as GitHub's processing and security obligations with respect to Customer Personal Data. Any person, entity, or service collecting data from the Service must comply with the GitHub Privacy Statement, particularly in regards to the collection of Users' Personal Information (as defined in the GitHub Privacy Statement). If Customer collects any User Personal Information from GitHub, Customer will only use it for the purpose for which the External User has authorized it. Customer will reasonably secure any such Personal Information, and Customer will respond promptly to complaints, removal requests, and "do not contact" requests from GitHub or External Users. ### D. Content Responsibility; Ownership; License Rights diff --git a/content/github/site-policy-deprecated/github-data-protection-addendum.md b/content/github/site-policy/github-data-protection-agreement-non-enterprise-customers.md similarity index 81% rename from content/github/site-policy-deprecated/github-data-protection-addendum.md rename to content/github/site-policy/github-data-protection-agreement-non-enterprise-customers.md index 13bd4e73ac..10d8e0df84 100644 --- a/content/github/site-policy-deprecated/github-data-protection-addendum.md +++ b/content/github/site-policy/github-data-protection-agreement-non-enterprise-customers.md @@ -1,17 +1,17 @@ --- -title: GitHub Data Protection Addendum -hidden: true +title: GitHub Data Protection Agreement (Non-Enterprise Customers) redirect_from: - /github/site-policy/github-data-protection-addendum + - /github/site-policy-deprecated/github-data-protection-addendum versions: free-pro-team: '*' --- -_These terms apply to Customers who licensed the Products prior to January 4, 2021. Customers who purchase GitHub Products after that date are directed to https://www.github.com/enterprise-legal for current terms._ +_These terms apply to non-enterprise customers. They also apply to enterprise customers who licensed GitHub offerings prior to January 4, 2021. Enterprise customers who purchase GitHub offerings after that date are directed to https://www.github.com/enterprise-legal for current terms._ ## INTRODUCTION -The parties agree that the GitHub Data Protection and Security Exhibit (together, the **"Data Protection Addendum"** or **“DPA”**) sets forth their obligations with respect to the processing and security of Customer Personal Data in connection with the GitHub Enterprise Cloud hosted service (the **“Service”**). GitHub makes the commitments in this DPA to all customers using the Service. Separate terms, including different privacy and security terms, govern Customer’s use of non-GitHub products. +The parties agree that the GitHub Data Protection Agreement (Non-Enterprise Customers) (**“DPA”**) sets forth their obligations with respect to the processing of Customer Personal Data in connection with the GitHub Enterprise Cloud hosted service (the **“Service”**). GitHub makes the commitments in this DPA to all non-enterprise customers using the Service. Separate terms, including different privacy terms, govern Customer’s use of non-GitHub products. In the event of any conflict or inconsistency between the DPA and any other terms in Customer’s agreements with GitHub, the DPA shall prevail. The provisions of the DPA supersede any conflicting provisions of the GitHub Privacy Statement that otherwise may apply to processing of Customer Personal Data as defined herein. For clarity, consistent with Clause 10 of the Standard Contractual Clauses in Attachment 1, the Standard Contractual Clauses prevail over any other terms in the DPA. @@ -88,21 +88,18 @@ e. *The obligations and rights of Customer* are set out in the Agreement and th ### 4. Security and Audit Obligations. #### 4.1 Technical and Organizational Security Measures. -Taking into account the state of the art, the costs of implementation, and the nature, scope, context and purposes of processing as well as the risk of varying likelihood and severity for the rights and freedoms of natural persons, GitHub will implement appropriate technical and organizational measures to ensure a level of security appropriate to the risks, such as against accidental or unlawful destruction, or loss, alteration, unauthorized disclosure or access, presented by processing the Protected Data. GitHub will regularly monitor compliance with these measures and will continue to take appropriate safeguards throughout the duration of the Agreement. Please see Section 1.1 of the GitHub Security Exhibit regarding GitHub's responsibilities in relation to security safeguards. +Taking into account the state of the art, the costs of implementation, and the nature, scope, context and purposes of processing as well as the risk of varying likelihood and severity for the rights and freedoms of natural persons, GitHub will implement appropriate technical and organizational measures to ensure a level of security appropriate to the risks, such as against accidental or unlawful destruction, or loss, alteration, unauthorized disclosure or access, presented by processing the Protected Data. GitHub will regularly monitor compliance with these measures and will continue to take appropriate safeguards throughout the duration of the Agreement. #### 4.2 Incident Response and Breach Notification. -GitHub will comply with the Information Security obligations in the GitHub Security Exhibit and the Applicable Data Protection Laws, including Data Breach notification obligations. Please see Section 1.2 of the GitHub Security Exhibit regarding GitHub's responsibilities in relation to Data Breach response and notification. +GitHub will comply with Applicable Data Protection Laws. #### 4.3 GitHub Personnel. GitHub represents and warrants that it will take reasonable steps to ensure that all GitHub personnel processing Protected Data have agreed to keep the Protected Data confidential and have received adequate training on compliance with this Addendum and the Applicable Data Protection Laws. #### 4.4 Records. -GitHub will maintain complete, accurate, and up to date written records of all categories of processing activities carried out on behalf of Customer containing the information required under the Applicable Data Protection Laws. To the extent that assistance does not risk the security of GitHub or the privacy rights of individual Data Subjects, GitHub will make these records available to Customer on request as reasonably required, such as to help Customer demonstrate its compliance under the Applicable Data Protection Laws. To learn more about GitHub's requirements to provide assistance in the event of a security incident, please see Section 1.2 of the GitHub Security Exhibit. +GitHub will maintain complete, accurate, and up to date written records of all categories of processing activities carried out on behalf of Customer containing the information required under the Applicable Data Protection Laws. To the extent that assistance does not risk the security of GitHub or the privacy rights of individual Data Subjects, GitHub will make these records available to Customer on request as reasonably required, such as to help Customer demonstrate its compliance under the Applicable Data Protection Laws. -#### 4.5 Compliance Reporting. -GitHub will provide security compliance reporting in accordance with Section 2.3 of the GitHub Security Exhibit and privacy compliance reporting in accordance with Section 2.3 of the GitHub Security Exhibit. Customer agrees that any information and audit rights granted by the Applicable Data Protection Laws (including, where applicable, Article 28(3)(h) of the GDPR) will be satisfied by these compliance reports, and will only arise to the extent that GitHub's provision of a compliance report does not provide sufficient information, or to the extent that Customer must respond to a regulatory or Supervisory Authority audit. Section 3.1 of the GitHub Security Exhibit describes the Parties' responsibilities in relation to a regulatory or Supervisory Authority audit. - -#### 4.6 Assistance. +#### 4.5 Assistance. GitHub will provide reasonable assistance to Customer with concerns such as data privacy impact assessments, Data Subject rights requests, consultations with Supervisory Authorities, and other similar matters, in each case solely in relation to the processing of Customer Personal Data and taking into account the nature of processing. ### 5. Use and Disclosure of Protected Data. @@ -346,7 +343,8 @@ Attn: Privacy 88 Colin P. Kelly Jr. Street San Francisco, CA 94107 USA -**3. Technical and Organization Measures.** The data importer has implemented and will maintain appropriate technical and organizational measures, internal controls, and information security routines intended to protect Customer Personal Data, as defined in the GitHub Security Exhibit, against accidental loss, destruction, or alteration; unauthorized disclosure or access; or unlawful destruction as follows: The technical and organizational measures, internal controls, and information security routines set forth in the GitHub Security Exhibit are hereby incorporated into this Appendix 2 by this reference and are binding on the data importer as if they were set forth in this Appendix 2 in their entirety. +**3. Technical and Organization Measures.** The data importer has implemented and will maintain appropriate technical and organizational measures, internal controls, and information security routines intended to protect Customer Personal Data against accidental loss, destruction, alteration, unauthorized disclosure or access or unlawful destruction. + Signature of GitHub, Inc. appears below. Signing the Standard Contractual Clauses, Appendix 1 and Appendix 2 on behalf of the data importer @@ -356,77 +354,3 @@ Signing the Standard Contractual Clauses, Appendix 1 and Appendix 2 on behalf of Lynn Hashimoto, Head of Product & Regulatory Legal GitHub, Inc. - - -## SECURITY EXHIBIT - -### 1. Information Security Program. - -#### 1.1 Security Management. - -Throughout the duration of the Agreement, GitHub will maintain and enforce a written information security program (**"Security Program"**) that aligns with industry recognized frameworks; includes security safeguards reasonably designed to protect the confidentiality, integrity, availability, and resilience of Customer Protected Data; is appropriate to the nature, size, and complexity of GitHub's business operations; and complies with the Applicable Data Protection Laws and other specific information security related laws and regulations that are applicable to the geographic regions in which GitHub does business. - -a. Security Officer. GitHub has designated a senior employee to be responsible for overseeing and carrying out its Security Program and for governance and internal communications regarding information security matters. - -b. Security Program Changes. GitHub will not make changes to its Security Program that adversely affect the security of any Customer Protected Data where notification is required under applicable laws and regulations. - -c. GitHub will maintain standard security industry practices to include, but are not limited to: - -- Vulnerability Management Program -- Secure Development Training, Review and Coding Practices -- Production Systems Logical and Physical Access Controls -- External Technical Assessments and Audits -- Security Policies, Standards and Standard Operating Procedures -- Security and Privacy Awareness Training - - -#### 1.2 Security Incident Management. -Throughout the duration of the Agreement, and where applicable, GitHub will provide a Security incident management program as follows: - -a. Security Availability and Escalation. GitHub will maintain appropriate security contact and escalation processes on a 24-hours-per-day, 7-days-per-week basis to ensure customers and employees can submit issues to the GitHub Security team. - -b. Incident Response. If GitHub becomes aware of a breach of security leading to the accidental or unlawful destruction, loss, alteration, unauthorized disclosure of, or access to Customer Personal Data (each a **"Security Incident"**), GitHub will promptly and without undue delay (1) notify Customer of the Security Incident; (2) investigate the Security Incident and provide Customer with detailed information about the Security Incident; (3) take reasonable steps to mitigate the effects and to minimize any damage resulting from the Security Incident. - -c. Notification. Notification(s) of Security Incidents will be delivered to one or more of Customer's administrators by any means GitHub selects. It is Customer's sole responsibility to ensure Customer's administrators monitor for and respond to any notifications. Customer is solely responsible for complying with its obligations under incident notification laws applicable to Customer and fulfilling any third-party notification obligations related to any Security Incident. - -d. Reasonable Assistance. GitHub will make commercially reasonable efforts to assist Customer in fulfilling Customer's obligation under applicable law or regulation to notify the relevant supervisory authority and data subjects about such Security Incident. - -#### 1.3 Due Diligence over Subcontractors and Vendors. -GitHub will maintain appropriate due diligence when utilizing subcontractors and vendors. GitHub will maintain vendor assessment reports and any assessment work for a minimum of three years. - -#### 1.4 Data Center Physical Safeguards. -To the extent GitHub utilizes third party vendors to host production environments, GitHub will select vendors that comply with physical security controls outlined in industry standards and that issue an annual external audit report such as SOC 2 or ISO 27001 certification. All access to areas, cabinets, or racks that house telecommunications, networking devices, and other "data transmission lines" or equipment will be controlled as follows: - -a. access will be controlled by badge reader at one or more entrance points; - -b. doors used only as exit points will have only "one way" doorknobs or crash bar exit devices installed; - -c. all doors will be equipped with door alarm contacts; - -d. all exit doors will have video surveillance capability; and - -e. all card access and video systems will be tied in to generator or UPS backup systems. - -### 2. Requests for Information and Compliance Reporting. - -#### 2.1 Requests for Information. -Upon Customer's written request and no more than once annually, GitHub will respond to one request for information to assess security and compliance risk-related information. The response will be provided in writing within thirty days of receipt of the request, pending needed clarifications of any request. - -#### 2.2 Response Contents. -GitHub will include in its annual response relevant audit reports for production datacenter, IaaS, PaaS or private hosting providers, as deemed relevant by GitHub, in its sole discretion and based on data and services rendered. - -#### 2.3 GitHub Security Audit Report. -GitHub will execute external audits to produce a SOC1, type 2, audit report and a SOC2, type 2, audit report. GitHub will continue to execute audits and issue corresponding reports for the duration of the Agreement on at least an annual basis. - -### 3. Cooperation with Regulatory Audits. -Should Customer realize a regulatory audit or an audit in response to a Supervisory Authority that requires participation from GitHub, GitHub will fully cooperate with related requests by providing access to relevant knowledgeable personnel, documentation, and application software. Customer has the following responsibilities regarding any such regulatory or Supervisory Authority audits: - -a. Customer must ensure use of an independent third party (meaning the regulator or regulator's delegate), and that findings and data not relevant to Customer are restricted from Customer’s access. - -b. Notification of such audit must be written and provided to GitHub in a timely fashion, pending regulator notification, and in a manner that allows for appropriate personnel to be made available to assist. Where regulators provide no advance notice to Customer of audit or investigation, GitHub will respond in as timely a fashion as required by regulators. - -c. Any third party auditor must disclose to GitHub any findings and recommended actions where allowed by regulator. - -d. In the event of a regulatory audit, access will be permitted only during regular business hours, Pacific time. - -e. To the extent permitted by law, Customer must keep confidential any information gathered through any such audit of GitHub that, by its nature, should be confidential. diff --git a/content/github/site-policy/github-privacy-statement.md b/content/github/site-policy/github-privacy-statement.md index ef3bca912f..50fe4dd423 100644 --- a/content/github/site-policy/github-privacy-statement.md +++ b/content/github/site-policy/github-privacy-statement.md @@ -192,7 +192,7 @@ Similarly, projects on GitHub may include publicly available User Personal Infor #### Organizations -You may indicate, through your actions on GitHub, that you are willing to share your User Personal Information. If you collaborate on or become a member of an Organization, then its Account owners may receive your User Personal Information. When you accept an invitation to an Organization, you will be notified of the types of information owners may be able to see (for more information, see [About Organization Membership](/github/setting-up-and-managing-your-github-user-account/about-organization-membership)). If you accept an invitation to an Organization with a [verified domain](/github/setting-up-and-managing-organizations-and-teams/verifying-your-organizations-domain), then the owners of that Organization will be able to see your full email address(es) within that Organization's verified domain(s). +You may indicate, through your actions on GitHub, that you are willing to share your User Personal Information. If you collaborate on or become a member of an Organization, then its Account owners may receive your User Personal Information. When you accept an invitation to an Organization, you will be notified of the types of information owners may be able to see (for more information, see [About Organization Membership](/github/setting-up-and-managing-your-github-user-account/about-organization-membership)). If you accept an invitation to an Organization with a [verified domain](/organizations/managing-organization-settings/verifying-your-organizations-domain), then the owners of that Organization will be able to see your full email address(es) within that Organization's verified domain(s). Please note, GitHub may share your username, [Usage Information](#usage-information), and [Device Information](#device-information) with the owner(s) of the Organization you are a member of, to the extent that your User Personal Information is provided only to investigate or respond to a security incident that affects or compromises the security of that particular Organization. @@ -321,7 +321,7 @@ In the unlikely event that a dispute arises between you and GitHub regarding our ### Changes to our Privacy Statement -Although most changes are likely to be minor, GitHub may change our Privacy Statement from time to time. We will provide notification to Users of material changes to this Privacy Statement through our Website at least 30 days prior to the change taking effect by posting a notice on our home page or sending email to the primary email address specified in your GitHub account. We will also update our [Site Policy repository](https://github.com/github/site-policy/), which tracks all changes to this policy. For other changes to this Privacy Statement, we encourage Users to [watch](/github/managing-subscriptions-and-notifications-on-github/viewing-your-subscriptions#configuring-your-watch-settings-for-an-individual-repository) or to check our Site Policy repository frequently. +Although most changes are likely to be minor, GitHub may change our Privacy Statement from time to time. We will provide notification to Users of material changes to this Privacy Statement through our Website at least 30 days prior to the change taking effect by posting a notice on our home page or sending email to the primary email address specified in your GitHub account. We will also update our [Site Policy repository](https://github.com/github/site-policy/), which tracks all changes to this policy. For other changes to this Privacy Statement, we encourage Users to [watch](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#configuring-your-watch-settings-for-an-individual-repository) or to check our Site Policy repository frequently. ### License diff --git a/content/github/site-policy/github-subprocessors-and-cookies.md b/content/github/site-policy/github-subprocessors-and-cookies.md index c36e6115d1..09fc30434b 100644 --- a/content/github/site-policy/github-subprocessors-and-cookies.md +++ b/content/github/site-policy/github-subprocessors-and-cookies.md @@ -13,7 +13,7 @@ topics: - legal --- -Effective date: **January 29, 2021** +Effective date: **April 2, 2021** GitHub provides a great deal of transparency regarding how we use your data, how we collect your data, and with whom we share your data. To that end, we provide this page, which details [our subprocessors](#github-subprocessors), and how we use [cookies](#cookies-on-github). @@ -33,7 +33,6 @@ When we share your information with third party subprocessors, such as our vendo | MailChimp | Customer ticketing mail services provider | United States | United States | | Mailgun | Transactional mail services provider | United States | United States | | Microsoft | Microsoft Services | United States | United States | -| Monday.com | Team collaboration and project management platform | United States | Israel | | Nexmo | SMS notification provider | United States | United States | | Salesforce.com | Customer relations management | United States | United States | | Sentry.io | Application monitoring provider | United States | United States | diff --git a/content/github/site-policy/index.md b/content/github/site-policy/index.md index 9d4e8b3ef8..72c9182c43 100644 --- a/content/github/site-policy/index.md +++ b/content/github/site-policy/index.md @@ -16,6 +16,7 @@ topics: {% link_in_list /github-terms-of-service %} {% link_in_list /github-corporate-terms-of-service %} {% link_in_list /github-privacy-statement %} +{% link_in_list /github-data-protection-agreement-non-enterprise-customers %} {% link_in_list /global-privacy-practices %} {% link_in_list /github-insights-and-data-protection-for-your-organization %} {% link_in_list /github-sponsors-additional-terms %} diff --git a/content/github/supporting-the-open-source-community-with-github-sponsors/about-github-sponsors-for-open-source-contributors.md b/content/github/supporting-the-open-source-community-with-github-sponsors/about-github-sponsors-for-open-source-contributors.md index 567107b3e5..5d9db83338 100644 --- a/content/github/supporting-the-open-source-community-with-github-sponsors/about-github-sponsors-for-open-source-contributors.md +++ b/content/github/supporting-the-open-source-community-with-github-sponsors/about-github-sponsors-for-open-source-contributors.md @@ -24,7 +24,9 @@ You can set a goal for your sponsorships. For more information, see "[Managing y ### Sponsorship tiers -{% data reusables.sponsors.tier-details %} For more information, see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)," "[Setting up {% data variables.product.prodname_sponsors %} for your organization](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-organization), and "[Changing your sponsorship tiers](/articles/changing-your-sponsorship-tiers)." +{% data reusables.sponsors.tier-details %} For more information, see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)," "[Setting up {% data variables.product.prodname_sponsors %} for your organization](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-organization), and "[Managing your sponsorship tiers](/github/supporting-the-open-source-community-with-github-sponsors/managing-your-sponsorship-tiers)." + +It's best to set up a range of different sponsorship options, including monthly and one-time tiers, to make it easy for anyone to support your work. In particular, one-time payments allow people to reward your efforts without worrying about whether their finances will support a regular payment schedule. ### Sponsorship payouts @@ -34,5 +36,9 @@ You can set a goal for your sponsorships. For more information, see "[Managing y For more information, see "[Managing your payouts from {% data variables.product.prodname_sponsors %}](/github/supporting-the-open-source-community-with-github-sponsors/managing-your-payouts-from-github-sponsors)." +### Sharing feedback about {% data variables.product.prodname_sponsors %} + +{% data reusables.sponsors.feedback %} + ### Further reading - "[FAQ with the {% data variables.product.prodname_sponsors %} team](https://github.blog/2019-06-12-faq-with-the-github-sponsors-team/)" on {% data variables.product.prodname_blog %} diff --git a/content/github/supporting-the-open-source-community-with-github-sponsors/about-github-sponsors.md b/content/github/supporting-the-open-source-community-with-github-sponsors/about-github-sponsors.md index 0169550a2d..a93f6df83a 100644 --- a/content/github/supporting-the-open-source-community-with-github-sponsors/about-github-sponsors.md +++ b/content/github/supporting-the-open-source-community-with-github-sponsors/about-github-sponsors.md @@ -37,7 +37,7 @@ To be eligible for the {% data variables.product.prodname_matching_fund %}, you ### Sharing feedback about {% data variables.product.prodname_sponsors %} -This is just the beginning — we'd love your input to make sure {% data variables.product.prodname_sponsors %} serves your needs into the future. Please send us your feedback or suggestions by contacting [{% data variables.contact.github_support %}](https://support.github.com/contact?form%5Bsubject%5D=GitHub+Sponsors). +{% data reusables.sponsors.feedback %} ### Further reading - "[Sponsoring open source contributors](/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-open-source-contributors)" diff --git a/content/github/supporting-the-open-source-community-with-github-sponsors/contacting-your-sponsors.md b/content/github/supporting-the-open-source-community-with-github-sponsors/contacting-your-sponsors.md index 5b8efe069c..de523d754e 100644 --- a/content/github/supporting-the-open-source-community-with-github-sponsors/contacting-your-sponsors.md +++ b/content/github/supporting-the-open-source-community-with-github-sponsors/contacting-your-sponsors.md @@ -15,6 +15,8 @@ Your sponsors can choose whether they receive email updates about your work. For For sponsored developer accounts, the update will come from your user account's primary email address. If you've enabled email address privacy on your user account, the update will come from `noreply@github.com` instead. For sponsored organizations, the update will come from the organization's `noreply@github.com` email address. For more information, see "[Setting your commit email address](/articles/setting-your-commit-email-address)." +You can also contact any one-time sponsors who contributed within the last 30 days and enabled updates. + ### Contacting your sponsors {% data reusables.sponsors.navigate-to-sponsors-dashboard %} diff --git a/content/github/supporting-the-open-source-community-with-github-sponsors/index.md b/content/github/supporting-the-open-source-community-with-github-sponsors/index.md index 6623eceb6b..39d60b8feb 100644 --- a/content/github/supporting-the-open-source-community-with-github-sponsors/index.md +++ b/content/github/supporting-the-open-source-community-with-github-sponsors/index.md @@ -25,7 +25,7 @@ topics: {% link_in_list /setting-up-github-sponsors-for-your-organization %} {% link_in_list /editing-your-profile-details-for-github-sponsors %} {% link_in_list /managing-your-sponsorship-goal %} - {% link_in_list /changing-your-sponsorship-tiers %} + {% link_in_list /managing-your-sponsorship-tiers %} {% link_in_list /viewing-your-sponsors-and-sponsorships %} {% link_in_list /managing-your-payouts-from-github-sponsors %} {% link_in_list /configuring-webhooks-for-events-in-your-sponsored-account %} diff --git a/content/github/supporting-the-open-source-community-with-github-sponsors/managing-your-sponsorship-goal.md b/content/github/supporting-the-open-source-community-with-github-sponsors/managing-your-sponsorship-goal.md index 1d9a6e18e3..9991858a58 100644 --- a/content/github/supporting-the-open-source-community-with-github-sponsors/managing-your-sponsorship-goal.md +++ b/content/github/supporting-the-open-source-community-with-github-sponsors/managing-your-sponsorship-goal.md @@ -13,6 +13,12 @@ You can set a funding goal for your sponsored account and share the goal with yo Your goal can set a target for the number of sponsors you want to have or the amount of money you want to earn each month. You can only set one goal up at a time. After you reach a goal, you can set another goal. +{% note %} + +**Note:** Goals are intended to help people track momentum so only monthly sponsors contribute toward your goal. + +{% endnote %} + ### Setting a goal {% data reusables.sponsors.navigate-to-sponsors-dashboard %} diff --git a/content/github/supporting-the-open-source-community-with-github-sponsors/changing-your-sponsorship-tiers.md b/content/github/supporting-the-open-source-community-with-github-sponsors/managing-your-sponsorship-tiers.md similarity index 62% rename from content/github/supporting-the-open-source-community-with-github-sponsors/changing-your-sponsorship-tiers.md rename to content/github/supporting-the-open-source-community-with-github-sponsors/managing-your-sponsorship-tiers.md index f6d6dc0bd7..efb3ada4b5 100644 --- a/content/github/supporting-the-open-source-community-with-github-sponsors/changing-your-sponsorship-tiers.md +++ b/content/github/supporting-the-open-source-community-with-github-sponsors/managing-your-sponsorship-tiers.md @@ -1,8 +1,9 @@ --- -title: Changing your sponsorship tiers +title: Managing your sponsorship tiers intro: 'You can add a new sponsorship tier, or edit or retire an existing tier.' redirect_from: - /articles/changing-your-sponsorship-tiers + - /github/supporting-the-open-source-community-with-github-sponsors/changing-your-sponsorship-tiers versions: free-pro-team: '*' topics: @@ -32,3 +33,13 @@ topics: {% data reusables.sponsors.tier-price-description %} {% data reusables.sponsors.tier-update %} {% data reusables.sponsors.retire-tier %} + +### Enabling tiers with custom amounts + +{% data reusables.sponsors.navigate-to-sponsors-dashboard %} +{% data reusables.sponsors.navigate-to-sponsor-tiers-tab %} +{% data reusables.sponsors.enable-custom-amounts %} + +### Disabling tiers with custom amounts + +You can disable tiers with custom amounts by deselecting the **Enable custom amounts** option on the **Sponsor tiers** tab. If you disable custom amounts, all custom tiers are retired. diff --git a/content/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-organization.md b/content/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-organization.md index 5a7e674121..a73b66dc54 100644 --- a/content/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-organization.md +++ b/content/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-organization.md @@ -48,6 +48,7 @@ To join {% data variables.product.prodname_sponsors %} as an individual contribu {% data reusables.sponsors.tier-price-description %} {% data reusables.sponsors.save-tier-draft %} {% data reusables.sponsors.review-and-publish-tier %} +{% data reusables.sponsors.enable-custom-amounts %} {% data reusables.sponsors.add-more-tiers %} ### Submitting your bank information diff --git a/content/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account.md b/content/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account.md index 6104ee4c03..b42f036470 100644 --- a/content/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account.md +++ b/content/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account.md @@ -48,6 +48,7 @@ After {% data variables.product.prodname_dotcom %} reviews your application, you {% data reusables.sponsors.tier-price-description %} {% data reusables.sponsors.save-tier-draft %} {% data reusables.sponsors.review-and-publish-tier %} +{% data reusables.sponsors.enable-custom-amounts %} {% data reusables.sponsors.add-more-tiers %} ### Submitting your bank information diff --git a/content/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-an-open-source-contributor.md b/content/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-an-open-source-contributor.md index c09ee905fb..aa7befca82 100644 --- a/content/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-an-open-source-contributor.md +++ b/content/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-an-open-source-contributor.md @@ -1,6 +1,6 @@ --- title: Sponsoring an open source contributor -intro: 'You can make a monthly recurring payment to a developer or organization who designs, creates, or maintains open source projects you depend on.' +intro: 'You can make a one-time or monthly recurring payment to a developer or organization who designs, creates, or maintains open source projects you depend on.' redirect_from: - /articles/sponsoring-a-developer - /articles/sponsoring-an-open-source-contributor @@ -24,11 +24,11 @@ You can sponsor an account on behalf of your user account to invest in projects - Developing brand awareness as an organization that values open source - Thanking open source developers for building libraries that complement the product your organization offers -You can use a credit card to sponsor an account on {% data variables.product.product_name %}. If your organization wants to pay by invoice, [contact us](https://support.github.com/contact/org-sponsors-waitlist). +You use your normal payment method to sponsor an account on {% data variables.product.product_name %}. If your organization wants to pay by invoice, [contact us](https://support.github.com/contact/org-sponsors-waitlist). {% data reusables.sponsors.no-fees %} For more information, see "[About billing for {% data variables.product.prodname_sponsors %}](/articles/about-billing-for-github-sponsors)." -When you sponsor an account using a credit card, the change will become effective immediately. {% data reusables.sponsors.prorated-sponsorship %} +When you sponsor an account the change is effective immediately, unless you are sponsoring on behalf of an organization that pays by invoice. {% data reusables.sponsors.prorated-sponsorship %} Your sponsorship is included in the next scheduled payment to the sponsored account. {% data reusables.sponsors.manage-updates-for-orgs %} @@ -56,6 +56,7 @@ Before you can sponsor an account, you must have a verified email address. For m ![Sponsor button](/assets/images/help/sponsors/sponsor-org-button.png) 1. Optionally, on the right side of the page, to sponsor the account on behalf of your organization, use the **Sponsor as** drop-down menu, and click the organization. ![Drop-down menu to choose the account you'll sponsor as](/assets/images/help/sponsors/sponsor-as-drop-down-menu.png) +{% data reusables.sponsors.review-tiers-to-select %} {% data reusables.sponsors.select-a-tier %} {% data reusables.sponsors.pay-prorated-amount %} {% data reusables.sponsors.select-sponsorship-billing %} diff --git a/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md b/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md index 8715b60c43..8ed3c8b13b 100644 --- a/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md +++ b/content/github/visualizing-repository-data-with-graphs/about-the-dependency-graph.md @@ -88,6 +88,6 @@ The recommended formats explicitly define which versions are used for all direct - "[Dependency graph](https://en.wikipedia.org/wiki/Dependency_graph)" on Wikipedia - "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)"{% if currentVersion == "free-pro-team@latest" %} -- "[Viewing insights for your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization)" +- "[Viewing insights for your organization](/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization)" - "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)" - "[Troubleshooting the detection of vulnerable dependencies](/github/managing-security-vulnerabilities/troubleshooting-the-detection-of-vulnerable-dependencies)"{% endif %} diff --git a/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md b/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md index 56d82c7dea..56bb2af5bf 100644 --- a/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md +++ b/content/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository.md @@ -67,7 +67,7 @@ For public repositories, the dependents view shows how the repository is used by Repository administrators can enable or disable the dependency graph for private repositories. -You can also enable or disable the dependency graph for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +You can also enable or disable the dependency graph for all repositories owned by your user account or organization. For more information, see "[Managing security and analysis settings for your user account](/github/setting-up-and-managing-your-github-user-account/managing-security-and-analysis-settings-for-your-user-account)" or "[Managing security and analysis settings for your organization](//organizations/collaborating-with-groups-in-organizations/managing-security-and-analysis-settings-for-your-organization)." {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} @@ -109,7 +109,7 @@ If a manifest or lock file is not processed, its dependencies are omitted from t ### Further reading - "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)"{% if currentVersion == "free-pro-team@latest" %} -- "[Viewing insights for your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization)" +- "[Viewing insights for your organization](/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization)" - "[Viewing and updating vulnerable dependencies in your repository](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository)" - "[Understanding how {% data variables.product.product_name %} uses and protects your data](/github/understanding-how-github-uses-and-protects-your-data)" {% endif %} diff --git a/content/github/working-with-github-pages/getting-started-with-github-pages.md b/content/github/working-with-github-pages/getting-started-with-github-pages.md deleted file mode 100644 index 12d5e61d51..0000000000 --- a/content/github/working-with-github-pages/getting-started-with-github-pages.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -title: Getting started with GitHub Pages -intro: 'You can set up a basic {% data variables.product.prodname_pages %} site for yourself, your organization, or your project.' -redirect_from: - - /categories/github-pages-basics - - /articles/additional-customizations-for-github-pages/ - - /articles/getting-started-with-github-pages -product: '{% data reusables.gated-features.pages %}' -mapTopic: true -versions: - free-pro-team: '*' - enterprise-server: '*' - github-ae: '*' -topics: - - pages ---- - diff --git a/content/github/working-with-github-pages/index.md b/content/github/working-with-github-pages/index.md deleted file mode 100644 index 3580a1e6b2..0000000000 --- a/content/github/working-with-github-pages/index.md +++ /dev/null @@ -1,47 +0,0 @@ ---- -title: Working with GitHub Pages -shortTitle: GitHub Pages -intro: 'You can create a website directly from a {% data variables.product.product_name %} repository.' -redirect_from: - - /categories/20/articles/ - - /categories/95/articles/ - - /categories/github-pages-features/ - - /pages/ - - /categories/96/articles/ - - /categories/github-pages-troubleshooting/ - - /categories/working-with-github-pages -product: '{% data reusables.gated-features.pages %}' -versions: - free-pro-team: '*' - enterprise-server: '*' - github-ae: '*' -topics: - - pages ---- - - -### Table of Contents - -{% topic_link_in_list /getting-started-with-github-pages %} - {% link_in_list /about-github-pages %} - {% link_in_list /creating-a-github-pages-site %} - {% link_in_list /adding-a-theme-to-your-github-pages-site-with-the-theme-chooser %} - {% link_in_list /configuring-a-publishing-source-for-your-github-pages-site %} - {% link_in_list /changing-the-visibility-of-your-github-pages-site %} - {% link_in_list /creating-a-custom-404-page-for-your-github-pages-site %} - {% link_in_list /securing-your-github-pages-site-with-https %} - {% link_in_list /using-submodules-with-github-pages %} - {% link_in_list /unpublishing-a-github-pages-site %} -{% topic_link_in_list /setting-up-a-github-pages-site-with-jekyll %} - {% link_in_list /about-github-pages-and-jekyll %} - {% link_in_list /creating-a-github-pages-site-with-jekyll %} - {% link_in_list /testing-your-github-pages-site-locally-with-jekyll %} - {% link_in_list /adding-content-to-your-github-pages-site-using-jekyll %} - {% link_in_list /setting-a-markdown-processor-for-your-github-pages-site-using-jekyll %} - {% link_in_list /adding-a-theme-to-your-github-pages-site-using-jekyll %} - {% link_in_list /about-jekyll-build-errors-for-github-pages-sites %} - {% link_in_list /troubleshooting-jekyll-build-errors-for-github-pages-sites %} -{% topic_link_in_list /configuring-a-custom-domain-for-your-github-pages-site %} - {% link_in_list /about-custom-domains-and-github-pages %} - {% link_in_list /managing-a-custom-domain-for-your-github-pages-site %} - {% link_in_list /troubleshooting-custom-domains-and-github-pages %} diff --git a/content/github/working-with-github-pages/setting-up-a-github-pages-site-with-jekyll.md b/content/github/working-with-github-pages/setting-up-a-github-pages-site-with-jekyll.md deleted file mode 100644 index 6f204fdb8a..0000000000 --- a/content/github/working-with-github-pages/setting-up-a-github-pages-site-with-jekyll.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -title: Setting up a GitHub Pages site with Jekyll -intro: 'You can use Jekyll, a popular static site generator, to further customize your {% data variables.product.prodname_pages %} site.' -redirect_from: - - /articles/using-jekyll-with-pages/ - - /articles/using-jekyll-as-a-static-site-generator-with-github-pages - - /articles/setting-up-a-github-pages-site-with-jekyll -product: '{% data reusables.gated-features.pages %}' -mapTopic: true -versions: - free-pro-team: '*' - enterprise-server: '*' - github-ae: '*' -topics: - - pages ---- - diff --git a/content/github/working-with-github-support/submitting-a-ticket.md b/content/github/working-with-github-support/submitting-a-ticket.md index 616b7929fd..606b703318 100644 --- a/content/github/working-with-github-support/submitting-a-ticket.md +++ b/content/github/working-with-github-support/submitting-a-ticket.md @@ -11,7 +11,7 @@ topics: If your account uses a paid {% data variables.product.prodname_dotcom %} product, you can directly contact {% data variables.contact.github_support %}. If your account uses {% data variables.product.prodname_free_user %} for user accounts and organizations, you can contact {% data variables.contact.contact_support %} to report account, security, and abuse issues. For more information, see "[About GitHub Support](/github/working-with-github-support/about-github-support)." -If you use {% data variables.product.prodname_ghe_server %}, {% data variables.product.prodname_ghe_cloud %}, or the {% data variables.product.premium_support_plan %} you must submit tickets using the {% data variables.contact.enterprise_portal %}. +If you do not have an enterprise account, please use the {% data variables.contact.enterprise_portal %} to submit tickets. For more information about enterprise accounts, see "[About enterprise accounts](/github/setting-up-and-managing-your-enterprise/about-enterprise-accounts)." ### Submitting a ticket using the {% data variables.contact.support_portal %} diff --git a/content/index.md b/content/index.md index 8a144eecbf..82990b3fbb 100644 --- a/content/index.md +++ b/content/index.md @@ -13,5 +13,43 @@ featuredLinks: - /github/getting-started-with-github/managing-remote-repositories - /github/working-with-github-pages versions: '*' +children: + - github + - admin + - organizations + - code-security + - actions + - packages + - developers + - rest + - graphql + - insights + - discussions + - communities + - pages + - education + - desktop + - early-access +externalProducts: + cli: + id: cli + name: GitHub CLI + href: 'https://cli.github.com/manual' + external: true + atom: + id: atom + name: Atom + href: 'https://atom.io/docs' + external: true + electron: + id: electron + name: Electron + href: 'https://electronjs.org/docs' + external: true + codeql: + id: codeql + name: 'CodeQL' + href: 'https://codeql.github.com/docs' + external: true --- diff --git a/content/github/setting-up-and-managing-organizations-and-teams/about-organizations.md b/content/organizations/collaborating-with-groups-in-organizations/about-organizations.md similarity index 89% rename from content/github/setting-up-and-managing-organizations-and-teams/about-organizations.md rename to content/organizations/collaborating-with-groups-in-organizations/about-organizations.md index 9b777b5eee..f2dda89e95 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/about-organizations.md +++ b/content/organizations/collaborating-with-groups-in-organizations/about-organizations.md @@ -3,6 +3,7 @@ title: About organizations intro: Organizations are shared accounts where businesses and open-source projects can collaborate across many projects at once. Owners and administrators can manage member access to the organization's data and projects with sophisticated security and administrative features. redirect_from: - /articles/about-organizations + - /github/setting-up-and-managing-organizations-and-teams/about-organizations versions: free-pro-team: '*' enterprise-server: '*' @@ -23,7 +24,7 @@ For organizations that belong to an enterprise account, billing is managed at th {% data reusables.gated-features.enterprise-accounts %} -{% data reusables.organizations.org-ownership-recommendation %} For more information, see "[Maintaining ownership continuity for your organization](/github/setting-up-and-managing-organizations-and-teams/maintaining-ownership-continuity-for-your-organization)." +{% data reusables.organizations.org-ownership-recommendation %} For more information, see "[Maintaining ownership continuity for your organization](/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization)." ### Terms of service and data protection for organizations diff --git a/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md b/content/organizations/collaborating-with-groups-in-organizations/about-your-organization-dashboard.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md rename to content/organizations/collaborating-with-groups-in-organizations/about-your-organization-dashboard.md index c2c416383a..6b42ae2b62 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard.md +++ b/content/organizations/collaborating-with-groups-in-organizations/about-your-organization-dashboard.md @@ -3,6 +3,7 @@ title: About your organization dashboard intro: 'As an organization member, you can visit your organization''s dashboard throughout the day to stay updated on recent activity and keep track of issues and pull requests you''re working on or following in the organization.' redirect_from: - /articles/about-your-organization-dashboard + - /github/setting-up-and-managing-organizations-and-teams/about-your-organization-dashboard versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/about-your-organizations-news-feed.md b/content/organizations/collaborating-with-groups-in-organizations/about-your-organizations-news-feed.md similarity index 94% rename from content/github/setting-up-and-managing-organizations-and-teams/about-your-organizations-news-feed.md rename to content/organizations/collaborating-with-groups-in-organizations/about-your-organizations-news-feed.md index daa42f63eb..0716148ce9 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/about-your-organizations-news-feed.md +++ b/content/organizations/collaborating-with-groups-in-organizations/about-your-organizations-news-feed.md @@ -5,6 +5,7 @@ redirect_from: - /articles/news-feed/ - /articles/about-your-organization-s-news-feed - /articles/about-your-organizations-news-feed + - /github/setting-up-and-managing-organizations-and-teams/about-your-organizations-news-feed versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/accessing-your-organizations-settings.md b/content/organizations/collaborating-with-groups-in-organizations/accessing-your-organizations-settings.md similarity index 92% rename from content/github/setting-up-and-managing-organizations-and-teams/accessing-your-organizations-settings.md rename to content/organizations/collaborating-with-groups-in-organizations/accessing-your-organizations-settings.md index cbddd686f4..77c054c4be 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/accessing-your-organizations-settings.md +++ b/content/organizations/collaborating-with-groups-in-organizations/accessing-your-organizations-settings.md @@ -8,6 +8,7 @@ redirect_from: - /articles/managing-an-organization-s-settings/ - /articles/accessing-your-organization-s-settings - /articles/accessing-your-organizations-settings + - /github/setting-up-and-managing-organizations-and-teams/accessing-your-organizations-settings intro: 'The organization account settings page provides several ways to manage the account, such as billing, team membership, and repository settings.' versions: free-pro-team: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/creating-a-new-organization-from-scratch.md b/content/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch.md similarity index 92% rename from content/github/setting-up-and-managing-organizations-and-teams/creating-a-new-organization-from-scratch.md rename to content/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch.md index db638bafff..160442e4f7 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/creating-a-new-organization-from-scratch.md +++ b/content/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch.md @@ -8,6 +8,7 @@ versions: redirect_from: - /articles/creating-a-new-organization-from-scratch - /admin/user-management/creating-organizations + - /github/setting-up-and-managing-organizations-and-teams/creating-a-new-organization-from-scratch topics: - organizations - teams diff --git a/content/organizations/collaborating-with-groups-in-organizations/index.md b/content/organizations/collaborating-with-groups-in-organizations/index.md new file mode 100644 index 0000000000..1cff1af763 --- /dev/null +++ b/content/organizations/collaborating-with-groups-in-organizations/index.md @@ -0,0 +1,22 @@ +--- +title: Collaborating with groups in organizations +intro: Groups of people can collaborate across many projects at the same time in organization accounts. +redirect_from: + - /articles/creating-a-new-organization-account/ + - /articles/collaborating-with-groups-in-organizations + - /github/setting-up-and-managing-organizations-and-teams/collaborating-with-groups-in-organizations +versions: + free-pro-team: '*' + enterprise-server: '*' + github-ae: '*' +topics: + - organizations + - teams +--- + +{% link_in_list /about-organizations %} +{% link_in_list /about-your-organization-dashboard %} +{% link_in_list /creating-a-new-organization-from-scratch %} +{% link_in_list /accessing-your-organizations-settings %} +{% link_in_list /about-your-organizations-news-feed %} +{% link_in_list /viewing-insights-for-your-organization %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md b/content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md similarity index 82% rename from content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md rename to content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md index ff36847928..d5302d7056 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization.md +++ b/content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md @@ -4,6 +4,7 @@ intro: 'Organization insights provide data about your organization''s activity, product: '{% data reusables.gated-features.org-insights %}' redirect_from: - /articles/viewing-insights-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/viewing-insights-for-your-organization versions: free-pro-team: '*' topics: @@ -50,9 +51,8 @@ With dependency insights you can view vulnerabilities, licenses, and other impor 7. You can click on {% octicon "package" aria-label="The package icon" %} **dependents** next to each vulnerability to see which dependents in your organization are using each library. ![My organizations vulnerable dependents](/assets/images/help/organizations/org-insights-dependencies-vulnerable-item.png) - ### Further reading - - - "[About organizations](/github/setting-up-and-managing-organizations-and-teams/about-organizations)" - - "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)" - - "[Changing the visibility of your organization's dependency insights](/github/setting-up-and-managing-organizations-and-teams/changing-the-visibility-of-your-organizations-dependency-insights)" - - "[Enforcing a policy on dependency insights in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account)" +### Further reading + - "[About organizations](/organizations/collaborating-with-groups-in-organizations/about-organizations)" + - "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository)" + - "[Changing the visibility of your organization's dependency insights](/organizations/managing-organization-settings/changing-the-visibility-of-your-organizations-dependency-insights)" + - "[Enforcing a policy on dependency insights in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account)" diff --git a/content/github/setting-up-and-managing-organizations-and-teams/about-team-discussions.md b/content/organizations/collaborating-with-your-team/about-team-discussions.md similarity index 90% rename from content/github/setting-up-and-managing-organizations-and-teams/about-team-discussions.md rename to content/organizations/collaborating-with-your-team/about-team-discussions.md index d95bfccf08..fd015fd529 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/about-team-discussions.md +++ b/content/organizations/collaborating-with-your-team/about-team-discussions.md @@ -4,6 +4,7 @@ intro: 'Your team can plan together, update one another, or talk about any topic redirect_from: - /articles/about-team-discussions - /github/building-a-strong-community/about-team-discussions + - /github/setting-up-and-managing-organizations-and-teams/about-team-discussions versions: free-pro-team: '*' enterprise-server: '*' @@ -18,7 +19,7 @@ Any organization member can post on your team's page or participate in a public ![Discussions tab of team page with public and private discussions](/assets/images/help/organizations/team-page-discussions-tab.png) -You can link to any team discussion to reference it elsewhere. You can pin important posts to your team's page for quick reference later. For more information, see "[Pinning a team discussion](/github/setting-up-and-managing-organizations-and-teams/pinning-a-team-discussion)." +You can link to any team discussion to reference it elsewhere. You can pin important posts to your team's page for quick reference later. For more information, see "[Pinning a team discussion](/organizations/collaborating-with-your-team/pinning-a-team-discussion)." ![Pinned discussions tab of team page with pinned discussion](/assets/images/help/organizations/team-discussions-pinned.png) @@ -44,5 +45,5 @@ For more information, see {% if currentVersion == "free-pro-team@latest" or curr - "[About conversations on {% data variables.product.prodname_dotcom %}](/articles/about-conversations-on-github)" - "[About teams](/articles/about-teams)" -- "[Creating a team discussion](/github/setting-up-and-managing-organizations-and-teams/creating-a-team-discussion)" -- "[Editing or deleting a team discussion](/github/setting-up-and-managing-organizations-and-teams/editing-or-deleting-a-team-discussion)" +- "[Creating a team discussion](/organizations/collaborating-with-your-team/creating-a-team-discussion)" +- "[Editing or deleting a team discussion](/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion)" diff --git a/content/github/setting-up-and-managing-organizations-and-teams/creating-a-team-discussion.md b/content/organizations/collaborating-with-your-team/creating-a-team-discussion.md similarity index 69% rename from content/github/setting-up-and-managing-organizations-and-teams/creating-a-team-discussion.md rename to content/organizations/collaborating-with-your-team/creating-a-team-discussion.md index 968a93eef7..db647d762e 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/creating-a-team-discussion.md +++ b/content/organizations/collaborating-with-your-team/creating-a-team-discussion.md @@ -4,6 +4,7 @@ intro: 'Any organization member can create a _public_ team discussion post. To c redirect_from: - /articles/creating-a-team-discussion - /github/building-a-strong-community/creating-a-team-discussion + - /github/setting-up-and-managing-organizations-and-teams/creating-a-team-discussion versions: free-pro-team: '*' enterprise-server: '*' @@ -12,7 +13,7 @@ topics: - community --- -{% data reusables.organizations.team-discussions-permissions %} For more information, see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)." +{% data reusables.organizations.team-discussions-permissions %} For more information, see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)." {% data reusables.profile.access_profile %} {% data reusables.profile.access_org %} @@ -27,6 +28,6 @@ topics: ### Further reading - - "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)" - - "[Editing or deleting a team discussion](/github/setting-up-and-managing-organizations-and-teams/editing-or-deleting-a-team-discussion)" - - "[Pinning a team discussion](/github/setting-up-and-managing-organizations-and-teams/pinning-a-team-discussion)" + - "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)" + - "[Editing or deleting a team discussion](/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion)" + - "[Pinning a team discussion](/organizations/collaborating-with-your-team/pinning-a-team-discussion)" diff --git a/content/github/setting-up-and-managing-organizations-and-teams/editing-or-deleting-a-team-discussion.md b/content/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion.md similarity index 72% rename from content/github/setting-up-and-managing-organizations-and-teams/editing-or-deleting-a-team-discussion.md rename to content/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion.md index 7397639d74..164e1f2abb 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/editing-or-deleting-a-team-discussion.md +++ b/content/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion.md @@ -4,6 +4,7 @@ intro: 'Organization members can edit or delete discussions on a team''s page. I redirect_from: - /articles/editing-or-deleting-a-team-discussion - /github/building-a-strong-community/editing-or-deleting-a-team-discussion + - /github/setting-up-and-managing-organizations-and-teams/editing-or-deleting-a-team-discussion versions: free-pro-team: '*' enterprise-server: '*' @@ -24,6 +25,6 @@ topics: ### Further reading - - "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)" - - "[Creating a team discussion](/github/setting-up-and-managing-organizations-and-teams/creating-a-team-discussion)" - - "[Pinning a team discussion](/github/setting-up-and-managing-organizations-and-teams/pinning-a-team-discussion)" + - "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)" + - "[Creating a team discussion](/organizations/collaborating-with-your-team/creating-a-team-discussion)" + - "[Pinning a team discussion](/organizations/collaborating-with-your-team/pinning-a-team-discussion)" diff --git a/content/github/setting-up-and-managing-organizations-and-teams/collaborating-with-your-team.md b/content/organizations/collaborating-with-your-team/index.md similarity index 56% rename from content/github/setting-up-and-managing-organizations-and-teams/collaborating-with-your-team.md rename to content/organizations/collaborating-with-your-team/index.md index cb4c12309f..a2dcb31f02 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/collaborating-with-your-team.md +++ b/content/organizations/collaborating-with-your-team/index.md @@ -1,10 +1,10 @@ --- title: Collaborating with your team intro: 'Within an organization, your team can work together across projects using team discussions.' -mapTopic: true redirect_from: - /articles/collaborating-with-your-team - /github/building-a-strong-community/collaborating-with-your-team + - /github/setting-up-and-managing-organizations-and-teams/collaborating-with-your-team versions: free-pro-team: '*' enterprise-server: '*' @@ -13,3 +13,7 @@ topics: - community --- +{% link_in_list /about-team-discussions %} +{% link_in_list /creating-a-team-discussion %} +{% link_in_list /editing-or-deleting-a-team-discussion %} +{% link_in_list /pinning-a-team-discussion %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/pinning-a-team-discussion.md b/content/organizations/collaborating-with-your-team/pinning-a-team-discussion.md similarity index 66% rename from content/github/setting-up-and-managing-organizations-and-teams/pinning-a-team-discussion.md rename to content/organizations/collaborating-with-your-team/pinning-a-team-discussion.md index 42459e82a6..e2d8c368ae 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/pinning-a-team-discussion.md +++ b/content/organizations/collaborating-with-your-team/pinning-a-team-discussion.md @@ -4,6 +4,7 @@ intro: 'You can pin important discussions to your organization''s team pages for redirect_from: - /articles/pinning-a-team-discussion - /github/building-a-strong-community/pinning-a-team-discussion + - /github/setting-up-and-managing-organizations-and-teams/pinning-a-team-discussion versions: free-pro-team: '*' enterprise-server: '*' @@ -21,6 +22,6 @@ topics: ### Further reading - - "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)" - - "[Creating a team discussion](/github/setting-up-and-managing-organizations-and-teams/creating-a-team-discussion)" - - "[Editing or deleting a team discussion](/github/setting-up-and-managing-organizations-and-teams/editing-or-deleting-a-team-discussion)" + - "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)" + - "[Creating a team discussion](/organizations/collaborating-with-your-team/creating-a-team-discussion)" + - "[Editing or deleting a team discussion](/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion)" diff --git a/content/github/setting-up-and-managing-organizations-and-teams/about-two-factor-authentication-and-saml-single-sign-on.md b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/about-two-factor-authentication-and-saml-single-sign-on.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/about-two-factor-authentication-and-saml-single-sign-on.md rename to content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/about-two-factor-authentication-and-saml-single-sign-on.md index d061e78d3a..b2449806a3 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/about-two-factor-authentication-and-saml-single-sign-on.md +++ b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/about-two-factor-authentication-and-saml-single-sign-on.md @@ -4,6 +4,7 @@ intro: Organizations administrators can enable both SAML single sign-on and two- product: '{% data reusables.gated-features.saml-sso %}' redirect_from: - /articles/about-two-factor-authentication-and-saml-single-sign-on + - /github/setting-up-and-managing-organizations-and-teams/about-two-factor-authentication-and-saml-single-sign-on versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/granting-access-to-your-organization-with-saml-single-sign-on.md b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/index.md similarity index 53% rename from content/github/setting-up-and-managing-organizations-and-teams/granting-access-to-your-organization-with-saml-single-sign-on.md rename to content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/index.md index 80c5ff6848..9406a2c559 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/granting-access-to-your-organization-with-saml-single-sign-on.md +++ b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/index.md @@ -1,9 +1,9 @@ --- title: Granting access to your organization with SAML single sign-on intro: 'Organization administrators can grant access to their organization with SAML single sign-on. This access can be granted to organization members, bots, and service accounts.' -mapTopic: true redirect_from: - /articles/granting-access-to-your-organization-with-saml-single-sign-on + - /github/setting-up-and-managing-organizations-and-teams/granting-access-to-your-organization-with-saml-single-sign-on versions: free-pro-team: '*' topics: @@ -11,3 +11,6 @@ topics: - teams --- +{% link_in_list /managing-bots-and-service-accounts-with-saml-single-sign-on %} +{% link_in_list /viewing-and-managing-a-members-saml-access-to-your-organization %} +{% link_in_list /about-two-factor-authentication-and-saml-single-sign-on %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-bots-and-service-accounts-with-saml-single-sign-on.md b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/managing-bots-and-service-accounts-with-saml-single-sign-on.md similarity index 91% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-bots-and-service-accounts-with-saml-single-sign-on.md rename to content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/managing-bots-and-service-accounts-with-saml-single-sign-on.md index f16c843a4e..a55b5ad411 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-bots-and-service-accounts-with-saml-single-sign-on.md +++ b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/managing-bots-and-service-accounts-with-saml-single-sign-on.md @@ -4,6 +4,7 @@ intro: Organizations that have enabled SAML single sign-on can retain access for product: '{% data reusables.gated-features.saml-sso %}' redirect_from: - /articles/managing-bots-and-service-accounts-with-saml-single-sign-on + - /github/setting-up-and-managing-organizations-and-teams/managing-bots-and-service-accounts-with-saml-single-sign-on versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization.md b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization.md rename to content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md index 484baa617a..d1e9d2dd81 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization.md +++ b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md @@ -6,6 +6,7 @@ product: '{% data reusables.gated-features.saml-sso %}' redirect_from: - /articles/viewing-and-revoking-organization-members-authorized-access-tokens - /github/setting-up-and-managing-organizations-and-teams/viewing-and-revoking-organization-members-authorized-access-tokens + - /github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization versions: free-pro-team: '*' topics: diff --git a/content/organizations/index.md b/content/organizations/index.md new file mode 100644 index 0000000000..0cfd817912 --- /dev/null +++ b/content/organizations/index.md @@ -0,0 +1,32 @@ +--- +title: Organizations and teams +shortTitle: Organizations +intro: Collaborate across many projects while managing access to projects and data and customizing settings for your organization. +redirect_from: + - /articles/about-improved-organization-permissions/ + - /categories/setting-up-and-managing-organizations-and-teams + - /github/setting-up-and-managing-organizations-and-teams +versions: + free-pro-team: '*' + enterprise-server: '*' + github-ae: '*' +topics: + - organizations + - teams +--- + +{% link_with_intro /collaborating-with-groups-in-organizations %} +{% link_with_intro /managing-membership-in-your-organization %} +{% link_with_intro /managing-peoples-access-to-your-organization-with-roles %} +{% link_with_intro /organizing-members-into-teams %} +{% link_with_intro /collaborating-with-your-team %} +{% link_with_intro /managing-access-to-your-organizations-repositories %} +{% link_with_intro /managing-access-to-your-organizations-project-boards %} +{% link_with_intro /managing-access-to-your-organizations-apps %} +{% link_with_intro /managing-organization-settings %} +{% link_with_intro /restricting-access-to-your-organizations-data %} +{% link_with_intro /keeping-your-organization-secure %} +{% link_with_intro /managing-saml-single-sign-on-for-your-organization %} +{% link_with_intro /granting-access-to-your-organization-with-saml-single-sign-on %} +{% link_with_intro /managing-git-access-to-your-organizations-repositories %} +{% link_with_intro /migrating-to-improved-organization-permissions %} diff --git a/content/organizations/keeping-your-organization-secure/index.md b/content/organizations/keeping-your-organization-secure/index.md new file mode 100644 index 0000000000..f3cdc109bd --- /dev/null +++ b/content/organizations/keeping-your-organization-secure/index.md @@ -0,0 +1,24 @@ +--- +title: Keeping your organization secure +intro: 'Organization owners have several features to help them keep their projects and data secure. If you''re the owner of an organization, you should regularly review your organization''s audit log{% if currentVersion != "github-ae@latest" %}, member 2FA status,{% endif %} and application settings to ensure that no unauthorized or malicious activity has occurred.' +redirect_from: + - /articles/preventing-unauthorized-access-to-organization-information/ + - /articles/keeping-your-organization-secure + - /github/setting-up-and-managing-organizations-and-teams/keeping-your-organization-secure +versions: + free-pro-team: '*' + enterprise-server: '*' + github-ae: '*' +topics: + - organizations + - teams +--- + +{% link_in_list /viewing-whether-users-in-your-organization-have-2fa-enabled %} +{% link_in_list /preparing-to-require-two-factor-authentication-in-your-organization %} +{% link_in_list /requiring-two-factor-authentication-in-your-organization %} +{% link_in_list /managing-security-and-analysis-settings-for-your-organization %} +{% link_in_list /managing-allowed-ip-addresses-for-your-organization %} +{% link_in_list /restricting-email-notifications-to-an-approved-domain %} +{% link_in_list /reviewing-the-audit-log-for-your-organization %} +{% link_in_list /reviewing-your-organizations-installed-integrations %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization.md b/content/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization.md rename to content/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization.md index 7b77503d4f..07f45a891f 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization.md +++ b/content/organizations/keeping-your-organization-secure/managing-allowed-ip-addresses-for-your-organization.md @@ -2,6 +2,8 @@ title: Managing allowed IP addresses for your organization intro: You can restrict access to your organization's assets by configuring a list of IP addresses that are allowed to connect. product: '{% data reusables.gated-features.allowed-ip-addresses %}' +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/managing-allowed-ip-addresses-for-your-organization versions: free-pro-team: '*' github-ae: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization.md b/content/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization.md similarity index 99% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization.md rename to content/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization.md index 2bb4b4ebc4..76c750732d 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization.md +++ b/content/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization.md @@ -4,6 +4,7 @@ intro: 'You can control features that secure and analyze the code in your organi permissions: Organization owners can manage security and analysis settings for repositories in the organization. redirect_from: - /github/setting-up-and-managing-organizations-and-teams/managing-secret-scanning-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization versions: free-pro-team: '*' enterprise-server: '>=3.0' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/preparing-to-require-two-factor-authentication-in-your-organization.md b/content/organizations/keeping-your-organization-secure/preparing-to-require-two-factor-authentication-in-your-organization.md similarity index 92% rename from content/github/setting-up-and-managing-organizations-and-teams/preparing-to-require-two-factor-authentication-in-your-organization.md rename to content/organizations/keeping-your-organization-secure/preparing-to-require-two-factor-authentication-in-your-organization.md index 8c14803057..6f803db18c 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/preparing-to-require-two-factor-authentication-in-your-organization.md +++ b/content/organizations/keeping-your-organization-secure/preparing-to-require-two-factor-authentication-in-your-organization.md @@ -3,6 +3,7 @@ title: Preparing to require two-factor authentication in your organization intro: 'Before requiring two-factor authentication (2FA), you can notify users about the upcoming change and verify who already uses 2FA.' redirect_from: - /articles/preparing-to-require-two-factor-authentication-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/preparing-to-require-two-factor-authentication-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization.md b/content/organizations/keeping-your-organization-secure/requiring-two-factor-authentication-in-your-organization.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization.md rename to content/organizations/keeping-your-organization-secure/requiring-two-factor-authentication-in-your-organization.md index cb8e427fcf..282a76b677 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization.md +++ b/content/organizations/keeping-your-organization-secure/requiring-two-factor-authentication-in-your-organization.md @@ -3,6 +3,7 @@ title: Requiring two-factor authentication in your organization intro: 'Organization owners can require {% if currentVersion == "free-pro-team@latest" %}organization members, outside collaborators, and billing managers{% else %}organization members and outside collaborators{% endif %} to enable two-factor authentication for their personal accounts, making it harder for malicious actors to access an organization''s repositories and settings.' redirect_from: - /articles/requiring-two-factor-authentication-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' @@ -37,7 +38,7 @@ You can also require two-factor authentication for organizations in an enterpris Before you can require {% if currentVersion == "free-pro-team@latest" %}organization members, outside collaborators, and billing managers{% else %}organization members and outside collaborators{% endif %} to use two-factor authentication, you must enable two-factor authentication for your account on {% data variables.product.product_name %}. For more information, see "[Securing your account with two-factor authentication (2FA)](/github/authenticating-to-github/securing-your-account-with-two-factor-authentication-2fa)." -Before you require use of two-factor authentication, we recommend notifying {% if currentVersion == "free-pro-team@latest" %}organization members, outside collaborators, and billing managers{% else %}organization members and outside collaborators{% endif %} and asking them to set up 2FA for their accounts. You can see if members and outside collaborators already use 2FA. For more information, see "[Viewing whether users in your organization have 2FA enabled](/github/setting-up-and-managing-organizations-and-teams/viewing-whether-users-in-your-organization-have-2fa-enabled)." +Before you require use of two-factor authentication, we recommend notifying {% if currentVersion == "free-pro-team@latest" %}organization members, outside collaborators, and billing managers{% else %}organization members and outside collaborators{% endif %} and asking them to set up 2FA for their accounts. You can see if members and outside collaborators already use 2FA. For more information, see "[Viewing whether users in your organization have 2FA enabled](/organizations/keeping-your-organization-secure/viewing-whether-users-in-your-organization-have-2fa-enabled)." ### Requiring two-factor authentication in your organization diff --git a/content/github/setting-up-and-managing-organizations-and-teams/restricting-email-notifications-to-an-approved-domain.md b/content/organizations/keeping-your-organization-secure/restricting-email-notifications-to-an-approved-domain.md similarity index 88% rename from content/github/setting-up-and-managing-organizations-and-teams/restricting-email-notifications-to-an-approved-domain.md rename to content/organizations/keeping-your-organization-secure/restricting-email-notifications-to-an-approved-domain.md index 75f20036b2..d4e2d5c231 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/restricting-email-notifications-to-an-approved-domain.md +++ b/content/organizations/keeping-your-organization-secure/restricting-email-notifications-to-an-approved-domain.md @@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.restrict-email-domain %}' redirect_from: - /articles/restricting-email-notifications-about-organization-activity-to-an-approved-email-domain/ - /articles/restricting-email-notifications-to-an-approved-domain + - /github/setting-up-and-managing-organizations-and-teams/restricting-email-notifications-to-an-approved-domain versions: free-pro-team: '*' topics: @@ -16,7 +17,7 @@ topics: When restricted email notifications are enabled in an organization, members can only use an email address associated with the organization's verified domains to receive email notifications about organization activity. For more information, see "[Verifying your organization's domain](/articles/verifying-your-organization-s-domain)." -Outside collaborators are not subject to restrictions on email notifications for verified domains. For more information on outside collaborators, see "[Permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization#outside-collaborators)." +Outside collaborators are not subject to restrictions on email notifications for verified domains. For more information on outside collaborators, see "[Permission levels for an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/permission-levels-for-an-organization#outside-collaborators)." If your organization is owned by an enterprise account, organization members will be able to receive notifications from any domains verified for the enterprise account, in addition to any domains verified for the organization. For more information, see "[Verifying your enterprise account's domain](/github/setting-up-and-managing-your-enterprise/verifying-your-enterprise-accounts-domain)." diff --git a/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md b/content/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization.md similarity index 94% rename from content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md rename to content/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization.md index a1e238e921..c428a012be 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md +++ b/content/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization.md @@ -4,6 +4,7 @@ intro: 'The audit log allows organization admins to quickly review the actions p miniTocMaxHeadingLevel: 4 redirect_from: - /articles/reviewing-the-audit-log-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization versions: free-pro-team: '*' enterprise-server: '*' @@ -48,7 +49,7 @@ To search for specific events, use the `action` qualifier in your query. Actions | [`issue`](#issue-category-actions) | Contains activities related to deleting an issue. {% if currentVersion == "free-pro-team@latest" %} | [`marketplace_agreement_signature`](#marketplace_agreement_signature-category-actions) | Contains all activities related to signing the {% data variables.product.prodname_marketplace %} Developer Agreement. | [`marketplace_listing`](#marketplace_listing-category-actions) | Contains all activities related to listing apps in {% data variables.product.prodname_marketplace %}.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %} -| [`members_can_create_pages`](#members_can_create_pages-category-actions) | Contains all activities related to managing the publication of {% data variables.product.prodname_pages %} sites for repositories in the organization. For more information, see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization)." | {% endif %} +| [`members_can_create_pages`](#members_can_create_pages-category-actions) | Contains all activities related to managing the publication of {% data variables.product.prodname_pages %} sites for repositories in the organization. For more information, see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)." | {% endif %} | [`org`](#org-category-actions) | Contains activities related to organization membership.{% if currentVersion == "free-pro-team@latest" %} | [`org_credential_authorization`](#org_credential_authorization-category-actions) | Contains all activities related to authorizing credentials for use with SAML single sign-on.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" or currentVersion == "github-ae@latest" %} | [`organization_label`](#organization_label-category-actions) | Contains all activities related to default labels for repositories in your organization.{% endif %} @@ -142,9 +143,9 @@ For example, you can make a GraphQL request to see all the new organization memb #### Using the REST API -{% note %} +{% note %} -**Note:** The audit log REST API is available as a public beta for users of {% data variables.product.prodname_ghe_cloud %} only. +**Note:** The audit log REST API is available for users of {% data variables.product.prodname_ghe_cloud %} only. {% endnote %} @@ -154,7 +155,7 @@ To ensure a secure IP and maintain compliance for your organization, you can use {% data reusables.audit_log.audit-log-git-events-retention %} -For more information about the audit log REST API, see "[Organizations](/rest/reference/orgs#get-the-audit-log-for-an-organization)" in the REST API documentation. +For more information about the audit log REST API, see "[Organizations](/rest/reference/orgs#get-the-audit-log-for-an-organization)." {% endif %} @@ -193,42 +194,42 @@ An overview of some of the most common actions that are recorded as events in th | Action | Description |------------------|------------------- -| `disable` | Triggered when an organization owner disables {% data variables.product.prodname_dependabot_alerts %} for all existing {% if currentVersion == "free-pro-team@latest" %}private {% endif %}repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +| `disable` | Triggered when an organization owner disables {% data variables.product.prodname_dependabot_alerts %} for all existing {% if currentVersion == "free-pro-team@latest" %}private {% endif %}repositories. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." | `enable` | Triggered when an organization owner enables {% data variables.product.prodname_dependabot_alerts %} for all existing {% if currentVersion == "free-pro-team@latest" %}private {% endif %}repositories. #### `dependabot_alerts_new_repos` category actions | Action | Description |------------------|------------------- -| `disable` | Triggered when an organization owner disables {% data variables.product.prodname_dependabot_alerts %} for all new {% if currentVersion == "free-pro-team@latest" %}private {% endif %}repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +| `disable` | Triggered when an organization owner disables {% data variables.product.prodname_dependabot_alerts %} for all new {% if currentVersion == "free-pro-team@latest" %}private {% endif %}repositories. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." | `enable` | Triggered when an organization owner enables {% data variables.product.prodname_dependabot_alerts %} for all new {% if currentVersion == "free-pro-team@latest" %}private {% endif %}repositories. #### `dependabot_security_updates` category actions | Action | Description |------------------|------------------- -| `disable` | Triggered when an organization owner disables {% data variables.product.prodname_dependabot_security_updates %} for all existing repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +| `disable` | Triggered when an organization owner disables {% data variables.product.prodname_dependabot_security_updates %} for all existing repositories. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." | `enable` | Triggered when an organization owner enables {% data variables.product.prodname_dependabot_security_updates %} for all existing repositories. #### `dependabot_security_updates_new_repos` category actions | Action | Description |------------------|------------------- -| `disable` | Triggered when an organization owner disables {% data variables.product.prodname_dependabot_security_updates %} for all new repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +| `disable` | Triggered when an organization owner disables {% data variables.product.prodname_dependabot_security_updates %} for all new repositories. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." | `enable` | Triggered when an organization owner enables {% data variables.product.prodname_dependabot_security_updates %} for all new repositories. #### `dependency_graph` category actions | Action | Description |------------------|------------------- -| `disable` | Triggered when an organization owner disables the dependency graph for all existing repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +| `disable` | Triggered when an organization owner disables the dependency graph for all existing repositories. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." | `enable` | Triggered when an organization owner enables the dependency graph for all existing repositories. #### `dependency_graph_new_repos` category actions | Action | Description |------------------|------------------- -| `disable` | Triggered when an organization owner disables the dependency graph for all new repositories. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)." +| `disable` | Triggered when an organization owner disables the dependency graph for all new repositories. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)." | `enable` | Triggered when an organization owner enables the dependency graph for all new repositories. {% endif %} @@ -270,9 +271,7 @@ An overview of some of the most common actions that are recorded as events in th {% note %} -**Note:** To access Git events in the audit log, you must use the audit log REST API. This functionality is available as a public beta for users of {% data variables.product.prodname_ghe_cloud %} only. - -For more information about the audit log REST API, see "[Organizations](/rest/reference/orgs#get-the-audit-log-for-an-organization)" in the REST API documentation. +**Note:** To access Git events in the audit log, you must use the audit log REST API. The audit log REST API is available for users of {% data variables.product.prodname_ghe_cloud %} only. For more information, see "[Organizations](/rest/reference/orgs#get-the-audit-log-for-an-organization)." {% endnote %} @@ -332,7 +331,7 @@ For more information about the audit log REST API, see "[Organizations](/rest/re #### `members_can_create_pages` category actions -For more information, see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization)." +For more information, see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)." | Action | Description | | :- | :- | @@ -369,8 +368,8 @@ For more information, see "[Managing the publication of {% data variables.produc | `remove_member` | Triggered when an [owner removes a member from an organization](/articles/removing-a-member-from-your-organization/){% if currentVersion != "github-ae@latest" %} or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an organization member doesn't use 2FA or disables 2FA{% endif %}. Also triggered when an [organization member removes themselves](/articles/removing-yourself-from-an-organization/) from an organization.| | `remove_outside_collaborator` | Triggered when an owner removes an outside collaborator from an organization{% if currentVersion != "github-ae@latest" %} or when [two-factor authentication is required in an organization](/articles/requiring-two-factor-authentication-in-your-organization) and an outside collaborator does not use 2FA or disables 2FA{% endif %}. |{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} | `remove_self_hosted_runner` | Triggered when a self-hosted runner is removed. For more information, see "[Removing a runner from an organization](/actions/hosting-your-own-runners/removing-self-hosted-runners#removing-a-runner-from-an-organization)." {% endif %}{% if currentVersion == "free-pro-team@latest" %} -| `revoke_external_identity` | Triggered when an organization owner revokes a member's linked identity. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." -| `revoke_sso_session` | Triggered when an organization owner revokes a member's SAML session. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." {% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `revoke_external_identity` | Triggered when an organization owner revokes a member's linked identity. For more information, see "[Viewing and managing a member's SAML access to your organization](/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." +| `revoke_sso_session` | Triggered when an organization owner revokes a member's SAML session. For more information, see "[Viewing and managing a member's SAML access to your organization](/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)." {% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} | `runner_group_created` | Triggered when a self-hosted runner group is created. For more information, see "[Creating a self-hosted runner group for an organization](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#creating-a-self-hosted-runner-group-for-an-organization)." | `runner_group_removed` | Triggered when a self-hosted runner group is removed. For more information, see "[Removing a self-hosted runner group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#removing-a-self-hosted-runner-group)." | `runner_group_updated` | Triggered when the configuration of a self-hosted runner group is changed. For more information, see "[Changing the access policy of a self-hosted runner group](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#changing-the-access-policy-of-a-self-hosted-runner-group)." @@ -380,7 +379,7 @@ For more information, see "[Managing the publication of {% data variables.produc | `self_hosted_runner_updated` | Triggered when the runner application is updated. Can be viewed using the REST API and the UI; not visible in the JSON/CSV export. For more information, see "[About self-hosted runners](/actions/hosting-your-own-runners/about-self-hosted-runners#about-self-hosted-runners)."{% endif %} | `unblock_user` | Triggered when an organization owner [unblocks a user from an organization](/communities/maintaining-your-safety-on-github/unblocking-a-user-from-your-organization).{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} | `update_actions_secret` |Triggered when a {% data variables.product.prodname_actions %} secret is updated.{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %} -| `update_new_repository_default_branch_setting` | Triggered when an owner changes the name of the default branch for new repositories in the organization. For more information, see "[Managing the default branch name for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)."{% endif %} +| `update_new_repository_default_branch_setting` | Triggered when an owner changes the name of the default branch for new repositories in the organization. For more information, see "[Managing the default branch name for repositories in your organization](/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization)."{% endif %} | `update_default_repository_permission` | Triggered when an owner changes the default repository permission level for organization members. | `update_member` | Triggered when an owner changes a person's role from owner to member or member to owner. | `update_member_repository_creation_permission` | Triggered when an owner changes the create repository permission for organization members.{% if currentVersion == "free-pro-team@latest" %} @@ -394,7 +393,7 @@ For more information, see "[Managing the publication of {% data variables.produc |------------------|------------------- | `grant` | Triggered when a member [authorizes credentials for use with SAML single sign-on](/github/authenticating-to-github/authenticating-with-saml-single-sign-on). | `deauthorized` | Triggered when a member [deauthorizes credentials for use with SAML single sign-on](/github/authenticating-to-github/authenticating-with-saml-single-sign-on). -| `revoke` | Triggered when an owner [revokes authorized credentials](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization). +| `revoke` | Triggered when an owner [revokes authorized credentials](/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization). {% endif %} @@ -594,7 +593,6 @@ For more information, see "[Managing the publication of {% data variables.produc | Action | Description |------------------|------------------- -| `repo_funding_link_button_toggle` | Triggered when you enable or disable a sponsor button in your repository (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)") | `repo_funding_links_file_action` | Triggered when you change the FUNDING file in your repository (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)") | `sponsor_sponsorship_cancel` | Triggered when you cancel a sponsorship (see "[Downgrading a sponsorship](/articles/downgrading-a-sponsorship)") | `sponsor_sponsorship_create` | Triggered when you sponsor an account (see "[Sponsoring an open source contributor](/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-an-open-source-contributor)") @@ -602,10 +600,12 @@ For more information, see "[Managing the publication of {% data variables.produc | `sponsor_sponsorship_tier_change` | Triggered when you upgrade or downgrade your sponsorship (see "[Upgrading a sponsorship](/articles/upgrading-a-sponsorship)" and "[Downgrading a sponsorship](/articles/downgrading-a-sponsorship)") | `sponsored_developer_approve` | Triggered when your {% data variables.product.prodname_sponsors %} account is approved (see "[Setting up {% data variables.product.prodname_sponsors %} for your organization](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-organization)") | `sponsored_developer_create` | Triggered when your {% data variables.product.prodname_sponsors %} account is created (see "[Setting up {% data variables.product.prodname_sponsors %} for your organization](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-organization)") +| `sponsored_developer_disable` | Triggered when your {% data variables.product.prodname_sponsors %} account is disabled +| `sponsored_developer_redraft` | Triggered when your {% data variables.product.prodname_sponsors %} account is returned to draft state from approved state | `sponsored_developer_profile_update` | Triggered when you edit your sponsored organization profile (see "[Editing your profile details for {% data variables.product.prodname_sponsors %}](/github/supporting-the-open-source-community-with-github-sponsors/editing-your-profile-details-for-github-sponsors)") | `sponsored_developer_request_approval` | Triggered when you submit your application for {% data variables.product.prodname_sponsors %} for approval (see "[Setting up {% data variables.product.prodname_sponsors %} for your organization](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-organization)") -| `sponsored_developer_tier_description_update` | Triggered when you change the description for a sponsorship tier (see "[Changing your sponsorship tiers](/articles/changing-your-sponsorship-tiers)") -| sponsored_developer_update_newsletter_send | Triggered when you send an email update to your sponsors (see "[Contacting your sponsors](/articles/contacting-your-sponsors)") +| `sponsored_developer_tier_description_update` | Triggered when you change the description for a sponsorship tier (see "[Managing your sponsorship tiers](/github/supporting-the-open-source-community-with-github-sponsors/managing-your-sponsorship-tiers)") +| `sponsored_developer_update_newsletter_send` | Triggered when you send an email update to your sponsors (see "[Contacting your sponsors](/articles/contacting-your-sponsors)") | `waitlist_invite_sponsored_developer` | Triggered when you are invited to join {% data variables.product.prodname_sponsors %} from the waitlist (see "[Setting up {% data variables.product.prodname_sponsors %} for your organization](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-organization)") | `waitlist_join` | Triggered when you join the waitlist to become a sponsored organization (see "[Setting up {% data variables.product.prodname_sponsors %} for your organization](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-organization)") {% endif %} @@ -619,9 +619,9 @@ For more information, see "[Managing the publication of {% data variables.produc | `change_parent_team` | Triggered when a child team is created or [a child team's parent is changed](/articles/moving-a-team-in-your-organization-s-hierarchy). | `change_privacy` | Triggered when a team's privacy level is changed. | `create` | Triggered when a new team is created.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %} -`demote_maintainer` | Triggered when a user was demoted from a team maintainer to a team member. For more information, see "[Giving "team maintainer" permissions to an organization member](/github/setting-up-and-managing-organizations-and-teams/giving-team-maintainer-permissions-to-an-organization-member)."{% endif %} +`demote_maintainer` | Triggered when a user was demoted from a team maintainer to a team member. For more information, see "[Giving "team maintainer" permissions to an organization member](/organizations/managing-peoples-access-to-your-organization-with-roles/giving-team-maintainer-permissions-to-an-organization-member)."{% endif %} | `destroy` | Triggered when a team is deleted from the organization.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %} -`team.promote_maintainer` | Triggered when a user was promoted from a team member to a team maintainer. For more information, see "[Giving "team maintainer" permissions to an organization member](/github/setting-up-and-managing-organizations-and-teams/giving-team-maintainer-permissions-to-an-organization-member)."{% endif %} +`team.promote_maintainer` | Triggered when a user was promoted from a team member to a team maintainer. For more information, see "[Giving "team maintainer" permissions to an organization member](/organizations/managing-peoples-access-to-your-organization-with-roles/giving-team-maintainer-permissions-to-an-organization-member)."{% endif %} | `remove_member` | Triggered when a member of an organization is [removed from a team](/articles/removing-organization-members-from-a-team). | `remove_repository` | Triggered when a repository is no longer under a team's control. diff --git a/content/github/setting-up-and-managing-organizations-and-teams/reviewing-your-organizations-installed-integrations.md b/content/organizations/keeping-your-organization-secure/reviewing-your-organizations-installed-integrations.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/reviewing-your-organizations-installed-integrations.md rename to content/organizations/keeping-your-organization-secure/reviewing-your-organizations-installed-integrations.md index 9250fa7013..751729a899 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/reviewing-your-organizations-installed-integrations.md +++ b/content/organizations/keeping-your-organization-secure/reviewing-your-organizations-installed-integrations.md @@ -4,6 +4,7 @@ intro: You can review the permission levels for your organization's installed in redirect_from: - /articles/reviewing-your-organization-s-installed-integrations - /articles/reviewing-your-organizations-installed-integrations + - /github/setting-up-and-managing-organizations-and-teams/reviewing-your-organizations-installed-integrations versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/viewing-whether-users-in-your-organization-have-2fa-enabled.md b/content/organizations/keeping-your-organization-secure/viewing-whether-users-in-your-organization-have-2fa-enabled.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/viewing-whether-users-in-your-organization-have-2fa-enabled.md rename to content/organizations/keeping-your-organization-secure/viewing-whether-users-in-your-organization-have-2fa-enabled.md index 3b499d3b26..62c8a59596 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/viewing-whether-users-in-your-organization-have-2fa-enabled.md +++ b/content/organizations/keeping-your-organization-secure/viewing-whether-users-in-your-organization-have-2fa-enabled.md @@ -3,6 +3,7 @@ title: Viewing whether users in your organization have 2FA enabled intro: 'You can see which organization owners, members, and outside collaborators have enabled two-factor authentication.' redirect_from: - /articles/viewing-whether-users-in-your-organization-have-2fa-enabled + - /github/setting-up-and-managing-organizations-and-teams/viewing-whether-users-in-your-organization-have-2fa-enabled versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/adding-github-app-managers-in-your-organization.md b/content/organizations/managing-access-to-your-organizations-apps/adding-github-app-managers-in-your-organization.md similarity index 95% rename from content/github/setting-up-and-managing-organizations-and-teams/adding-github-app-managers-in-your-organization.md rename to content/organizations/managing-access-to-your-organizations-apps/adding-github-app-managers-in-your-organization.md index 3af305e777..6f89ab06d6 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/adding-github-app-managers-in-your-organization.md +++ b/content/organizations/managing-access-to-your-organizations-apps/adding-github-app-managers-in-your-organization.md @@ -3,6 +3,7 @@ title: Adding GitHub App managers in your organization intro: 'Organization owners can grant users the ability to manage some or all {% data variables.product.prodname_github_app %}s owned by the organization.' redirect_from: - /articles/adding-github-app-managers-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/adding-github-app-managers-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-apps.md b/content/organizations/managing-access-to-your-organizations-apps/index.md similarity index 65% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-apps.md rename to content/organizations/managing-access-to-your-organizations-apps/index.md index 722baa5e9d..07610efc3f 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-apps.md +++ b/content/organizations/managing-access-to-your-organizations-apps/index.md @@ -4,7 +4,7 @@ intro: 'As an organization owner, you can allow individual organization members redirect_from: - /articles/managing-access-to-your-organization-s-apps - /articles/managing-access-to-your-organizations-apps -mapTopic: true + - /github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-apps versions: free-pro-team: '*' enterprise-server: '*' @@ -14,3 +14,5 @@ topics: - teams --- +{% link_in_list /adding-github-app-managers-in-your-organization %} +{% link_in_list /removing-github-app-managers-from-your-organization %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/removing-github-app-managers-from-your-organization.md b/content/organizations/managing-access-to-your-organizations-apps/removing-github-app-managers-from-your-organization.md similarity index 95% rename from content/github/setting-up-and-managing-organizations-and-teams/removing-github-app-managers-from-your-organization.md rename to content/organizations/managing-access-to-your-organizations-apps/removing-github-app-managers-from-your-organization.md index a5f65d7e72..d7b5fa1a25 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/removing-github-app-managers-from-your-organization.md +++ b/content/organizations/managing-access-to-your-organizations-apps/removing-github-app-managers-from-your-organization.md @@ -3,6 +3,7 @@ title: Removing GitHub App managers from your organization intro: 'Organization owners can revoke {% data variables.product.prodname_github_app %} manager permissions that were granted to a member of the organization.' redirect_from: - /articles/removing-github-app-managers-from-your-organization + - /github/setting-up-and-managing-organizations-and-teams/removing-github-app-managers-from-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md b/content/organizations/managing-access-to-your-organizations-project-boards/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md similarity index 91% rename from content/github/setting-up-and-managing-organizations-and-teams/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md rename to content/organizations/managing-access-to-your-organizations-project-boards/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md index 0332b57bcf..74731a14fc 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md +++ b/content/organizations/managing-access-to-your-organizations-project-boards/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md @@ -3,6 +3,7 @@ title: Adding an outside collaborator to a project board in your organization intro: 'As an organization owner or project board admin, you can add an outside collaborator and customize their permissions to a project board.' redirect_from: - /articles/adding-an-outside-collaborator-to-a-project-board-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/adding-an-outside-collaborator-to-a-project-board-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/organizations/managing-access-to-your-organizations-project-boards/index.md b/content/organizations/managing-access-to-your-organizations-project-boards/index.md new file mode 100644 index 0000000000..22f18b40c8 --- /dev/null +++ b/content/organizations/managing-access-to-your-organizations-project-boards/index.md @@ -0,0 +1,22 @@ +--- +title: Managing access to your organization’s project boards +intro: 'As an organization owner or project board admin, you can give organization members, teams, and outside collaborators different levels of access to project boards owned by your organization.' +redirect_from: + - /articles/managing-access-to-your-organization-s-project-boards + - /articles/managing-access-to-your-organizations-project-boards + - /github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-project-boards +versions: + free-pro-team: '*' + enterprise-server: '*' + github-ae: '*' +topics: + - organizations + - teams +--- + +{% link_in_list /project-board-permissions-for-an-organization %} +{% link_in_list /managing-access-to-a-project-board-for-organization-members %} +{% link_in_list /managing-team-access-to-an-organization-project-board %} +{% link_in_list /managing-an-individuals-access-to-an-organization-project-board %} +{% link_in_list /adding-an-outside-collaborator-to-a-project-board-in-your-organization %} +{% link_in_list /removing-an-outside-collaborator-from-an-organization-project-board %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-a-project-board-for-organization-members.md b/content/organizations/managing-access-to-your-organizations-project-boards/managing-access-to-a-project-board-for-organization-members.md similarity index 94% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-a-project-board-for-organization-members.md rename to content/organizations/managing-access-to-your-organizations-project-boards/managing-access-to-a-project-board-for-organization-members.md index b15db3e0cc..bc492c6b95 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-access-to-a-project-board-for-organization-members.md +++ b/content/organizations/managing-access-to-your-organizations-project-boards/managing-access-to-a-project-board-for-organization-members.md @@ -3,6 +3,7 @@ title: Managing access to a project board for organization members intro: 'As an organization owner or project board admin, you can set a default permission level for a project board for all organization members.' redirect_from: - /articles/managing-access-to-a-project-board-for-organization-members + - /github/setting-up-and-managing-organizations-and-teams/managing-access-to-a-project-board-for-organization-members versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-project-board.md b/content/organizations/managing-access-to-your-organizations-project-boards/managing-an-individuals-access-to-an-organization-project-board.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-project-board.md rename to content/organizations/managing-access-to-your-organizations-project-boards/managing-an-individuals-access-to-an-organization-project-board.md index 3141574194..17aa501e92 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-project-board.md +++ b/content/organizations/managing-access-to-your-organizations-project-boards/managing-an-individuals-access-to-an-organization-project-board.md @@ -4,6 +4,7 @@ intro: 'As an organization owner or project board admin, you can manage an indiv redirect_from: - /articles/managing-an-individual-s-access-to-an-organization-project-board - /articles/managing-an-individuals-access-to-an-organization-project-board + - /github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-project-board versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-project-board.md b/content/organizations/managing-access-to-your-organizations-project-boards/managing-team-access-to-an-organization-project-board.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-project-board.md rename to content/organizations/managing-access-to-your-organizations-project-boards/managing-team-access-to-an-organization-project-board.md index c1659ebf20..2d4ca65bea 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-project-board.md +++ b/content/organizations/managing-access-to-your-organizations-project-boards/managing-team-access-to-an-organization-project-board.md @@ -3,6 +3,7 @@ title: Managing team access to an organization project board intro: 'As an organization owner or project board admin, you can give a team access to a project board owned by your organization.' redirect_from: - /articles/managing-team-access-to-an-organization-project-board + - /github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-project-board versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/project-board-permissions-for-an-organization.md b/content/organizations/managing-access-to-your-organizations-project-boards/project-board-permissions-for-an-organization.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/project-board-permissions-for-an-organization.md rename to content/organizations/managing-access-to-your-organizations-project-boards/project-board-permissions-for-an-organization.md index c774786ca2..76290ae69f 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/project-board-permissions-for-an-organization.md +++ b/content/organizations/managing-access-to-your-organizations-project-boards/project-board-permissions-for-an-organization.md @@ -3,6 +3,7 @@ title: Project board permissions for an organization intro: 'Organization owners and people with project board admin permissions can customize who has read, write, and admin permissions to your organization’s project boards.' redirect_from: - /articles/project-board-permissions-for-an-organization + - /github/setting-up-and-managing-organizations-and-teams/project-board-permissions-for-an-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/removing-an-outside-collaborator-from-an-organization-project-board.md b/content/organizations/managing-access-to-your-organizations-project-boards/removing-an-outside-collaborator-from-an-organization-project-board.md similarity index 87% rename from content/github/setting-up-and-managing-organizations-and-teams/removing-an-outside-collaborator-from-an-organization-project-board.md rename to content/organizations/managing-access-to-your-organizations-project-boards/removing-an-outside-collaborator-from-an-organization-project-board.md index 8dfd92496e..4c2d3ff3cf 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/removing-an-outside-collaborator-from-an-organization-project-board.md +++ b/content/organizations/managing-access-to-your-organizations-project-boards/removing-an-outside-collaborator-from-an-organization-project-board.md @@ -3,6 +3,7 @@ title: Removing an outside collaborator from an organization project board intro: 'As an organization owner or project board admin, you can remove an outside collaborator''s access to a project board.' redirect_from: - /articles/removing-an-outside-collaborator-from-an-organization-project-board + - /github/setting-up-and-managing-organizations-and-teams/removing-an-outside-collaborator-from-an-organization-project-board versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/adding-outside-collaborators-to-repositories-in-your-organization.md b/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/adding-outside-collaborators-to-repositories-in-your-organization.md rename to content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md index 66a47afe1f..58569ea263 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/adding-outside-collaborators-to-repositories-in-your-organization.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md @@ -3,6 +3,7 @@ title: Adding outside collaborators to repositories in your organization intro: 'An *outside collaborator* is a person who isn''t explicitly a member of your organization, but who has Read, Write, or Admin permissions to one or more repositories in your organization.' redirect_from: - /articles/adding-outside-collaborators-to-repositories-in-your-organization + - github/setting-up-and-managing-organizations-and-teams/adding-outside-collaborators-to-repositories-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization.md b/content/organizations/managing-access-to-your-organizations-repositories/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization.md similarity index 89% rename from content/github/setting-up-and-managing-organizations-and-teams/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization.md rename to content/organizations/managing-access-to-your-organizations-repositories/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization.md index 221fd32ac7..fd25a1d7ff 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization.md @@ -2,6 +2,8 @@ title: Canceling an invitation to become an outside collaborator in your organization intro: You can cancel all invitations for a person to become an outside collaborator on repositories owned by your organization. permissions: Organization owners can cancel an invitation to become an outside collaborator in the organization. +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/converting-an-organization-member-to-an-outside-collaborator.md b/content/organizations/managing-access-to-your-organizations-repositories/converting-an-organization-member-to-an-outside-collaborator.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/converting-an-organization-member-to-an-outside-collaborator.md rename to content/organizations/managing-access-to-your-organizations-repositories/converting-an-organization-member-to-an-outside-collaborator.md index 0d2f02074d..c026e8b1a2 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/converting-an-organization-member-to-an-outside-collaborator.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/converting-an-organization-member-to-an-outside-collaborator.md @@ -3,6 +3,7 @@ title: Converting an organization member to an outside collaborator intro: 'If a current member of your organization only needs access to certain repositories, such as consultants or temporary employees, you can convert them to an *outside collaborator*.' redirect_from: - /articles/converting-an-organization-member-to-an-outside-collaborator + - /github/setting-up-and-managing-organizations-and-teams/converting-an-organization-member-to-an-outside-collaborator versions: free-pro-team: '*' enterprise-server: '*' @@ -23,7 +24,7 @@ After converting an organization member to an outside collaborator, they'll only - @mention any visible team - Be a team maintainer -For more information, see "[Permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization)." +For more information, see "[Permission levels for an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/permission-levels-for-an-organization)." We recommend reviewing the organization member's access to repositories to ensure their access is as you expect. For more information, see "[Managing an individual's access to an organization repository](/articles/managing-an-individual-s-access-to-an-organization-repository)." diff --git a/content/github/setting-up-and-managing-organizations-and-teams/converting-an-outside-collaborator-to-an-organization-member.md b/content/organizations/managing-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/converting-an-outside-collaborator-to-an-organization-member.md rename to content/organizations/managing-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md index 81ece0d1b2..3c8419917d 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/converting-an-outside-collaborator-to-an-organization-member.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md @@ -3,6 +3,7 @@ title: Converting an outside collaborator to an organization member intro: 'If you would like to give an outside collaborator on your organization''s repositories broader permissions within your organization, you can {% if currentVersion == "free-pro-team@latest" %}invite them to become a member of{% else %}make them a member of{% endif %} the organization.' redirect_from: - /articles/converting-an-outside-collaborator-to-an-organization-member + - /github/setting-up-and-managing-organizations-and-teams/converting-an-outside-collaborator-to-an-organization-member versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/organizations/managing-access-to-your-organizations-repositories/index.md b/content/organizations/managing-access-to-your-organizations-repositories/index.md new file mode 100644 index 0000000000..b8b30ba6d4 --- /dev/null +++ b/content/organizations/managing-access-to-your-organizations-repositories/index.md @@ -0,0 +1,28 @@ +--- +title: Managing access to your organization's repositories +intro: Organization owners can manage individual and team access to the organization's repositories. Team maintainers can also manage a team's repository access. +redirect_from: + - /articles/permission-levels-for-an-organization-repository/ + - /articles/managing-access-to-your-organization-s-repositories + - /articles/managing-access-to-your-organizations-repositories + - /github/setting-up-and-managing-organizations-and-teams/managing-access-to-your-organizations-repositories +versions: + free-pro-team: '*' + enterprise-server: '*' + github-ae: '*' +topics: + - organizations + - teams +--- + +{% link_in_list /repository-permission-levels-for-an-organization %} +{% link_in_list /setting-base-permissions-for-an-organization %} +{% link_in_list /viewing-people-with-access-to-your-repository %} +{% link_in_list /managing-an-individuals-access-to-an-organization-repository %} +{% link_in_list /managing-team-access-to-an-organization-repository %} +{% link_in_list /adding-outside-collaborators-to-repositories-in-your-organization %} +{% link_in_list /canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization %} +{% link_in_list /removing-an-outside-collaborator-from-an-organization-repository %} +{% link_in_list /converting-an-organization-member-to-an-outside-collaborator %} +{% link_in_list /converting-an-outside-collaborator-to-an-organization-member %} +{% link_in_list /reinstating-a-former-outside-collaborators-access-to-your-organization %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-repository.md b/content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md similarity index 95% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-repository.md rename to content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md index f7dcde666d..6f0267fc1d 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-repository.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md @@ -5,6 +5,7 @@ redirect_from: - /articles/managing-an-individual-s-access-to-an-organization-repository-early-access-program/ - /articles/managing-an-individual-s-access-to-an-organization-repository - /articles/managing-an-individuals-access-to-an-organization-repository + - /github/setting-up-and-managing-organizations-and-teams/managing-an-individuals-access-to-an-organization-repository versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-repository.md b/content/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-repository.md rename to content/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository.md index dca7e05e67..a5b068c85a 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-repository.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository.md @@ -4,6 +4,7 @@ intro: 'You can give a team access to a repository, remove a team''s access to a redirect_from: - /articles/managing-team-access-to-an-organization-repository-early-access-program/ - /articles/managing-team-access-to-an-organization-repository + - /github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-repository versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-outside-collaborators-access-to-your-organization.md b/content/organizations/managing-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md similarity index 97% rename from content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-outside-collaborators-access-to-your-organization.md rename to content/organizations/managing-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md index 042cca36ba..1b5f9e2ac5 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-outside-collaborators-access-to-your-organization.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md @@ -4,6 +4,7 @@ intro: 'You can reinstate a former outside collaborator''s access permissions fo redirect_from: - /articles/reinstating-a-former-outside-collaborator-s-access-to-your-organization - /articles/reinstating-a-former-outside-collaborators-access-to-your-organization + - /github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-outside-collaborators-access-to-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/removing-an-outside-collaborator-from-an-organization-repository.md b/content/organizations/managing-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/removing-an-outside-collaborator-from-an-organization-repository.md rename to content/organizations/managing-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md index 434d773e95..67d232afc6 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/removing-an-outside-collaborator-from-an-organization-repository.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md @@ -3,6 +3,7 @@ title: Removing an outside collaborator from an organization repository intro: Owners and repository admins can remove an outside collaborator's access to a repository. redirect_from: - /articles/removing-an-outside-collaborator-from-an-organization-repository + - /github/setting-up-and-managing-organizations-and-teams/removing-an-outside-collaborator-from-an-organization-repository versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization.md b/content/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization.md rename to content/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization.md index a3c245ff74..8ee588c9be 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization.md @@ -5,6 +5,7 @@ miniTocMaxHeadingLevel: 4 redirect_from: - /articles/repository-permission-levels-for-an-organization-early-access-program/ - /articles/repository-permission-levels-for-an-organization + - /github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization versions: free-pro-team: '*' enterprise-server: '*' @@ -33,7 +34,7 @@ From least access to most access, the permission levels for an organization repo For more information about giving people and teams access to repositories, see "[Managing access to your organization's repositories](/articles/managing-access-to-your-organizations-repositories)." -Organization owners can set base permissions that apply to all members of an organization when accessing any of the organization's repositories. For more information, see "[Setting base permissions for an organization](/github/setting-up-and-managing-organizations-and-teams/setting-base-permissions-for-an-organization#setting-base-permissions)." +Organization owners can set base permissions that apply to all members of an organization when accessing any of the organization's repositories. For more information, see "[Setting base permissions for an organization](/organizations/managing-access-to-your-organizations-repositories/setting-base-permissions-for-an-organization#setting-base-permissions)." Organization owners can also choose to further limit access to certain settings and actions across the organization. For more information on options for specific settings, see "[Managing organization settings](/articles/managing-organization-settings)." @@ -105,7 +106,7 @@ In addition to managing organization-level settings, organization owners have ad | Delete an issue (see "[Deleting an issue](/articles/deleting-an-issue)") | | | | | **X** | | Merge pull requests on protected branches, even if there are no approving reviews | | | | | **X** | | [Define code owners for a repository](/articles/about-code-owners) | | | | | **X** | -| Add a repository to a team (see "[Managing team access to an organization repository](/github/setting-up-and-managing-organizations-and-teams/managing-team-access-to-an-organization-repository#giving-a-team-access-to-a-repository)" for details) | | | | | **X** | +| Add a repository to a team (see "[Managing team access to an organization repository](/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository#giving-a-team-access-to-a-repository)" for details) | | | | | **X** | | [Manage outside collaborator access to a repository](/articles/adding-outside-collaborators-to-repositories-in-your-organization) | | | | | **X** | | [Change a repository's visibility](/articles/restricting-repository-visibility-changes-in-your-organization) | | | | | **X** | | Make a repository a template (see "[Creating a template repository](/articles/creating-a-template-repository)") | | | | | **X** | @@ -144,7 +145,7 @@ In this section, you can find the repository permission levels required for secu | [Dismiss {% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/viewing-and-updating-vulnerable-dependencies-in-your-repository) | | | | | **X** | | [Designate additional people or teams to receive {% data variables.product.prodname_dependabot_alerts %}](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository#granting-access-to-security-alerts) for vulnerable dependencies | | | | | **X** | | Create [security advisories](/github/managing-security-vulnerabilities/about-github-security-advisories) | | | | | **X** |{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %} -| Manage access to {% data variables.product.prodname_GH_advanced_security %} features (see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)") | | | | | **X** |{% endif %}{% if currentVersion == "free-pro-team@latest" %} +| Manage access to {% data variables.product.prodname_GH_advanced_security %} features (see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)") | | | | | **X** |{% endif %}{% if currentVersion == "free-pro-team@latest" %} | [Enable the dependency graph](/code-security/supply-chain-security/exploring-the-dependencies-of-a-repository) for a private repository | | | | | **X** | | [View dependency reviews](/code-security/supply-chain-security/about-dependency-review) | **X** | **X** | **X** | **X** | **X** |{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" or currentVersion == "github-ae@latest" %} | [View {% data variables.product.prodname_code_scanning %} alerts on pull requests](/github/finding-security-vulnerabilities-and-errors-in-your-code/triaging-code-scanning-alerts-in-pull-requests) | **X** | **X** | **X** | **X** | **X** | diff --git a/content/github/setting-up-and-managing-organizations-and-teams/setting-base-permissions-for-an-organization.md b/content/organizations/managing-access-to-your-organizations-repositories/setting-base-permissions-for-an-organization.md similarity index 77% rename from content/github/setting-up-and-managing-organizations-and-teams/setting-base-permissions-for-an-organization.md rename to content/organizations/managing-access-to-your-organizations-repositories/setting-base-permissions-for-an-organization.md index 64daf7b01f..2c22db47e3 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/setting-base-permissions-for-an-organization.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/setting-base-permissions-for-an-organization.md @@ -2,6 +2,8 @@ title: Setting base permissions for an organization intro: You can set base permissions for the repositories that an organization owns. permissions: Organization owners can set base permissions for an organization. +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/setting-base-permissions-for-an-organization versions: free-pro-team: '*' enterprise-server: '*' @@ -32,5 +34,5 @@ If someone with admin permissions to an organization's repository grants a membe ### Further reading -- "[Repository permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization#permission-levels-for-repositories-owned-by-an-organization)" -- "[Adding outside collaborators to repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/adding-outside-collaborators-to-repositories-in-your-organization)" +- "[Repository permission levels for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization#permission-levels-for-repositories-owned-by-an-organization)" +- "[Adding outside collaborators to repositories in your organization](/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization)" diff --git a/content/github/setting-up-and-managing-organizations-and-teams/viewing-people-with-access-to-your-repository.md b/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md similarity index 94% rename from content/github/setting-up-and-managing-organizations-and-teams/viewing-people-with-access-to-your-repository.md rename to content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md index eda9a879d3..6d7cacd9b6 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/viewing-people-with-access-to-your-repository.md +++ b/content/organizations/managing-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md @@ -3,6 +3,7 @@ title: Viewing people with access to your repository intro: 'Organization owners can view people’s access to a repository within an organization. Owners of organizations using {% data variables.product.prodname_ghe_cloud %} or {% data variables.product.prodname_ghe_server %} can also export a CSV list of people who have access to a repository.' redirect_from: - /articles/viewing-people-with-access-to-your-repository + - /github/setting-up-and-managing-organizations-and-teams/viewing-people-with-access-to-your-repository versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/about-ssh-certificate-authorities.md b/content/organizations/managing-git-access-to-your-organizations-repositories/about-ssh-certificate-authorities.md similarity index 98% rename from content/github/setting-up-and-managing-organizations-and-teams/about-ssh-certificate-authorities.md rename to content/organizations/managing-git-access-to-your-organizations-repositories/about-ssh-certificate-authorities.md index a61f9370d5..7b371b9ae4 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/about-ssh-certificate-authorities.md +++ b/content/organizations/managing-git-access-to-your-organizations-repositories/about-ssh-certificate-authorities.md @@ -4,6 +4,7 @@ intro: 'With an SSH certificate authority, your organization or enterprise accou product: '{% data reusables.gated-features.ssh-certificate-authorities %}' redirect_from: - /articles/about-ssh-certificate-authorities + - /github/setting-up-and-managing-organizations-and-teams/about-ssh-certificate-authorities versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-git-access-to-your-organizations-repositories.md b/content/organizations/managing-git-access-to-your-organizations-repositories/index.md similarity index 71% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-git-access-to-your-organizations-repositories.md rename to content/organizations/managing-git-access-to-your-organizations-repositories/index.md index 0070b8eba7..8bdd4f0224 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-git-access-to-your-organizations-repositories.md +++ b/content/organizations/managing-git-access-to-your-organizations-repositories/index.md @@ -1,11 +1,11 @@ --- title: Managing Git access to your organization's repositories intro: You can add an SSH certificate authority (CA) to your organization and allow members to access the organization's repositories over Git using keys signed by the SSH CA. -mapTopic: true product: '{% data reusables.gated-features.ssh-certificate-authorities %}' redirect_from: - /articles/managing-git-access-to-your-organizations-repositories-using-ssh-certificate-authorities/ - /articles/managing-git-access-to-your-organizations-repositories + - /github/setting-up-and-managing-organizations-and-teams/managing-git-access-to-your-organizations-repositories versions: free-pro-team: '*' enterprise-server: '*' @@ -15,3 +15,5 @@ topics: - teams --- +{% link_in_list /about-ssh-certificate-authorities %} +{% link_in_list /managing-your-organizations-ssh-certificate-authorities %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-your-organizations-ssh-certificate-authorities.md b/content/organizations/managing-git-access-to-your-organizations-repositories/managing-your-organizations-ssh-certificate-authorities.md similarity index 92% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-your-organizations-ssh-certificate-authorities.md rename to content/organizations/managing-git-access-to-your-organizations-repositories/managing-your-organizations-ssh-certificate-authorities.md index 1d363a5cc7..775efdaa45 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-your-organizations-ssh-certificate-authorities.md +++ b/content/organizations/managing-git-access-to-your-organizations-repositories/managing-your-organizations-ssh-certificate-authorities.md @@ -4,6 +4,7 @@ intro: You can add or delete SSH certificate authorities from your organization. product: '{% data reusables.gated-features.ssh-certificate-authorities %}' redirect_from: - /articles/managing-your-organizations-ssh-certificate-authorities + - /github/setting-up-and-managing-organizations-and-teams/managing-your-organizations-ssh-certificate-authorities versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/adding-people-to-your-organization.md b/content/organizations/managing-membership-in-your-organization/adding-people-to-your-organization.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/adding-people-to-your-organization.md rename to content/organizations/managing-membership-in-your-organization/adding-people-to-your-organization.md index dad0eb63df..a152a42a7a 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/adding-people-to-your-organization.md +++ b/content/organizations/managing-membership-in-your-organization/adding-people-to-your-organization.md @@ -3,6 +3,7 @@ title: Adding people to your organization intro: 'You can make anyone a member of your organization using their {% data variables.product.product_name %} username or email address.' redirect_from: - /articles/adding-people-to-your-organization + - /github/setting-up-and-managing-organizations-and-teams/adding-people-to-your-organization versions: enterprise-server: '*' github-ae: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/can-i-create-accounts-for-people-in-my-organization.md b/content/organizations/managing-membership-in-your-organization/can-i-create-accounts-for-people-in-my-organization.md similarity index 91% rename from content/github/setting-up-and-managing-organizations-and-teams/can-i-create-accounts-for-people-in-my-organization.md rename to content/organizations/managing-membership-in-your-organization/can-i-create-accounts-for-people-in-my-organization.md index 27a51a313a..f13fa6a80f 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/can-i-create-accounts-for-people-in-my-organization.md +++ b/content/organizations/managing-membership-in-your-organization/can-i-create-accounts-for-people-in-my-organization.md @@ -1,9 +1,10 @@ --- title: Can I create accounts for people in my organization? +intro: 'While you can add users to an organization you''ve created, you can''t create personal user accounts on behalf of another person.' redirect_from: - /articles/can-i-create-accounts-for-those-in-my-organization/ - /articles/can-i-create-accounts-for-people-in-my-organization -intro: 'While you can add users to an organization you''ve created, you can''t create personal user accounts on behalf of another person.' + - /github/setting-up-and-managing-organizations-and-teams/can-i-create-accounts-for-people-in-my-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/canceling-or-editing-an-invitation-to-join-your-organization.md b/content/organizations/managing-membership-in-your-organization/canceling-or-editing-an-invitation-to-join-your-organization.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/canceling-or-editing-an-invitation-to-join-your-organization.md rename to content/organizations/managing-membership-in-your-organization/canceling-or-editing-an-invitation-to-join-your-organization.md index 2e14f7e102..200cdfdc4b 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/canceling-or-editing-an-invitation-to-join-your-organization.md +++ b/content/organizations/managing-membership-in-your-organization/canceling-or-editing-an-invitation-to-join-your-organization.md @@ -3,6 +3,7 @@ title: Canceling or editing an invitation to join your organization intro: Organization owners can edit or cancel an invitation to become a member of your organization any time before the user accepts. redirect_from: - /articles/canceling-or-editing-an-invitation-to-join-your-organization + - /github/setting-up-and-managing-organizations-and-teams/canceling-or-editing-an-invitation-to-join-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-membership-in-your-organization.md b/content/organizations/managing-membership-in-your-organization/index.md similarity index 52% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-membership-in-your-organization.md rename to content/organizations/managing-membership-in-your-organization/index.md index 497c8251f9..f28c95e40d 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-membership-in-your-organization.md +++ b/content/organizations/managing-membership-in-your-organization/index.md @@ -4,7 +4,7 @@ intro: 'After you create your organization, you can {% if currentVersion == "fre redirect_from: - /articles/removing-a-user-from-your-organization/ - /articles/managing-membership-in-your-organization -mapTopic: true + - /github/setting-up-and-managing-organizations-and-teams/managing-membership-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' @@ -14,3 +14,10 @@ topics: - teams --- +{% link_in_list /inviting-users-to-join-your-organization %} +{% link_in_list /canceling-or-editing-an-invitation-to-join-your-organization %} + +{% link_in_list /adding-people-to-your-organization %} +{% link_in_list /removing-a-member-from-your-organization %} +{% link_in_list /reinstating-a-former-member-of-your-organization %} +{% link_in_list /can-i-create-accounts-for-people-in-my-organization %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/inviting-users-to-join-your-organization.md b/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md similarity index 80% rename from content/github/setting-up-and-managing-organizations-and-teams/inviting-users-to-join-your-organization.md rename to content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md index 7f2c029ce4..abef80d8f6 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/inviting-users-to-join-your-organization.md +++ b/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md @@ -5,6 +5,7 @@ permissions: Organization owners can invite users to join an organization. redirect_from: - /articles/adding-or-inviting-members-to-a-team-in-an-organization/ - /articles/inviting-users-to-join-your-organization + - /github/setting-up-and-managing-organizations-and-teams/inviting-users-to-join-your-organization versions: free-pro-team: '*' topics: @@ -16,7 +17,7 @@ topics: **Tips**: - If your organization has a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[About per-user pricing](/articles/about-per-user-pricing)." {% data reusables.organizations.org-invite-expiration %} -- If your organization requires members to use two-factor authentication, users that you invite must enable two-factor authentication before accepting the invitation. For more information, see "[Requiring two-factor authentication in your organization](/github/setting-up-and-managing-organizations-and-teams/requiring-two-factor-authentication-in-your-organization)" and "[Securing your account with two-factor authentication (2FA)](/github/authenticating-to-github/securing-your-account-with-two-factor-authentication-2fa)." +- If your organization requires members to use two-factor authentication, users that you invite must enable two-factor authentication before accepting the invitation. For more information, see "[Requiring two-factor authentication in your organization](/organizations/keeping-your-organization-secure/requiring-two-factor-authentication-in-your-organization)" and "[Securing your account with two-factor authentication (2FA)](/github/authenticating-to-github/securing-your-account-with-two-factor-authentication-2fa)." {% endtip %} diff --git a/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-member-of-your-organization.md b/content/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization.md similarity index 97% rename from content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-member-of-your-organization.md rename to content/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization.md index 5df6e4477f..7f78562df3 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-member-of-your-organization.md +++ b/content/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization.md @@ -3,6 +3,7 @@ title: Reinstating a former member of your organization intro: 'Organization owners can {% if currentVersion == "free-pro-team@latest" %}invite former organization members to rejoin{% else %}add former members to{% endif%} your organization, and choose whether to restore the person''s former role, access permissions, forks, and settings.' redirect_from: - /articles/reinstating-a-former-member-of-your-organization + - /github/setting-up-and-managing-organizations-and-teams/reinstating-a-former-member-of-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/removing-a-member-from-your-organization.md b/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md similarity index 97% rename from content/github/setting-up-and-managing-organizations-and-teams/removing-a-member-from-your-organization.md rename to content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md index 27a9d304b2..6bdae0a2f8 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/removing-a-member-from-your-organization.md +++ b/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md @@ -3,6 +3,7 @@ title: Removing a member from your organization intro: 'If members of your organization no longer require access to any repositories owned by the organization, you can remove them from the organization.' redirect_from: - /articles/removing-a-member-from-your-organization + - /github/setting-up-and-managing-organizations-and-teams/removing-a-member-from-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/allowing-people-to-delete-issues-in-your-organization.md b/content/organizations/managing-organization-settings/allowing-people-to-delete-issues-in-your-organization.md similarity index 92% rename from content/github/setting-up-and-managing-organizations-and-teams/allowing-people-to-delete-issues-in-your-organization.md rename to content/organizations/managing-organization-settings/allowing-people-to-delete-issues-in-your-organization.md index 9c994b1884..203fa34c9d 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/allowing-people-to-delete-issues-in-your-organization.md +++ b/content/organizations/managing-organization-settings/allowing-people-to-delete-issues-in-your-organization.md @@ -3,6 +3,7 @@ title: Allowing people to delete issues in your organization intro: Organization owners can allow certain people to delete issues in repositories owned by your organization. redirect_from: - /articles/allowing-people-to-delete-issues-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/allowing-people-to-delete-issues-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/changing-the-visibility-of-your-organizations-dependency-insights.md b/content/organizations/managing-organization-settings/changing-the-visibility-of-your-organizations-dependency-insights.md similarity index 91% rename from content/github/setting-up-and-managing-organizations-and-teams/changing-the-visibility-of-your-organizations-dependency-insights.md rename to content/organizations/managing-organization-settings/changing-the-visibility-of-your-organizations-dependency-insights.md index 790a56e104..353bd29d2e 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/changing-the-visibility-of-your-organizations-dependency-insights.md +++ b/content/organizations/managing-organization-settings/changing-the-visibility-of-your-organizations-dependency-insights.md @@ -4,6 +4,7 @@ intro: You can allow all organization members to view dependency insights for yo product: '{% data reusables.gated-features.org-insights %}' redirect_from: - /articles/changing-the-visibility-of-your-organizations-dependency-insights + - /github/setting-up-and-managing-organizations-and-teams/changing-the-visibility-of-your-organizations-dependency-insights versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization.md b/content/organizations/managing-organization-settings/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization.md similarity index 81% rename from content/github/setting-up-and-managing-organizations-and-teams/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization.md rename to content/organizations/managing-organization-settings/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization.md index 967d47bdf4..a10c0b1708 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization.md +++ b/content/organizations/managing-organization-settings/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization.md @@ -1,6 +1,8 @@ --- title: Configuring the retention period for GitHub Actions artifacts and logs in your organization intro: 'You can configure the retention period for {% data variables.product.prodname_actions %} artifacts and logs in your organization.' +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization versions: free-pro-team: '*' enterprise-server: '>=2.23' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/converting-an-organization-into-a-user.md b/content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/converting-an-organization-into-a-user.md rename to content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md index f12e2987df..134897705c 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/converting-an-organization-into-a-user.md +++ b/content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md @@ -3,6 +3,7 @@ title: Converting an organization into a user intro: 'It''s not possible to convert an organization into a personal user account, but you can create a new user account and transfer the organization''s repositories to it.' redirect_from: - /articles/converting-an-organization-into-a-user + - /github/setting-up-and-managing-organizations-and-teams/converting-an-organization-into-a-user versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/deleting-an-organization-account.md b/content/organizations/managing-organization-settings/deleting-an-organization-account.md similarity index 94% rename from content/github/setting-up-and-managing-organizations-and-teams/deleting-an-organization-account.md rename to content/organizations/managing-organization-settings/deleting-an-organization-account.md index ab490ccd8f..ba2ac612ec 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/deleting-an-organization-account.md +++ b/content/organizations/managing-organization-settings/deleting-an-organization-account.md @@ -3,6 +3,7 @@ title: Deleting an organization account intro: 'When you delete an organization, all repositories, forks of private repositories, wikis, issues, pull requests, and Project or Organization Pages are deleted as well. {% if currentVersion == "free-pro-team@latest" %}The organization name becomes available for use on a new user or organization account, and your billing will end.{% endif %}' redirect_from: - /articles/deleting-an-organization-account + - /github/setting-up-and-managing-organizations-and-teams/deleting-an-organization-account versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md b/content/organizations/managing-organization-settings/disabling-or-limiting-github-actions-for-your-organization.md similarity index 97% rename from content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md rename to content/organizations/managing-organization-settings/disabling-or-limiting-github-actions-for-your-organization.md index d21c9c8b6f..ca813fdfe1 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization.md +++ b/content/organizations/managing-organization-settings/disabling-or-limiting-github-actions-for-your-organization.md @@ -1,6 +1,8 @@ --- title: Disabling or limiting GitHub Actions for your organization intro: 'Organization owners can disable, enable, and limit GitHub Actions for an organization.' +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/disabling-or-limiting-github-actions-for-your-organization versions: free-pro-team: '*' enterprise-server: '>=2.22' diff --git a/content/organizations/managing-organization-settings/index.md b/content/organizations/managing-organization-settings/index.md new file mode 100644 index 0000000000..407237383f --- /dev/null +++ b/content/organizations/managing-organization-settings/index.md @@ -0,0 +1,39 @@ +--- +title: Managing organization settings +intro: 'Organization administrators can change several settings, including the names of repositories that belong to the organization and Owners team membership. In addition, organization admins can delete the organization and all of its repositories.' +redirect_from: + - /articles/managing-organization-settings + - /github/setting-up-and-managing-organizations-and-teams/managing-organization-settings +versions: + free-pro-team: '*' + enterprise-server: '*' + github-ae: '*' +topics: + - organizations + - teams +--- + +{% link_in_list /verifying-your-organizations-domain %} +{% link_in_list /renaming-an-organization %} +{% link_in_list /transferring-organization-ownership %} +{% link_in_list /restricting-repository-creation-in-your-organization %} +{% link_in_list /setting-permissions-for-deleting-or-transferring-repositories %} +{% link_in_list /restricting-repository-visibility-changes-in-your-organization %} +{% link_in_list /managing-the-forking-policy-for-your-organization %} +{% link_in_list /disabling-or-limiting-github-actions-for-your-organization %} +{% link_in_list /configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization %} +{% link_in_list /setting-permissions-for-adding-outside-collaborators %} +{% link_in_list /allowing-people-to-delete-issues-in-your-organization %}{% if currentVersion == "free-pro-team@latest" %} +{% link_in_list /managing-discussion-creation-for-repositories-in-your-organization %}{% endif %} +{% link_in_list /setting-team-creation-permissions-in-your-organization %} +{% link_in_list /managing-scheduled-reminders-for-your-organization %} +{% link_in_list /managing-the-default-branch-name-for-repositories-in-your-organization %} +{% link_in_list /managing-default-labels-for-repositories-in-your-organization %} +{% link_in_list /changing-the-visibility-of-your-organizations-dependency-insights %} +{% link_in_list /managing-the-display-of-member-names-in-your-organization %} +{% link_in_list /managing-updates-from-accounts-your-organization-sponsors %} +{% link_in_list /managing-the-publication-of-github-pages-sites-for-your-organization %} +{% link_in_list /deleting-an-organization-account %} +{% link_in_list /converting-an-organization-into-a-user %} +{% link_in_list /integrating-jira-with-your-organization-project-board %} +{% link_in_list /upgrading-to-the-corporate-terms-of-service %} diff --git a/content/github/setting-up-and-managing-organizations-and-teams/integrating-jira-with-your-organization-project-board.md b/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/integrating-jira-with-your-organization-project-board.md rename to content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md index 6a3cf2daff..53d4e71637 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/integrating-jira-with-your-organization-project-board.md +++ b/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md @@ -3,6 +3,7 @@ title: Integrating Jira with your organization project board intro: 'You can integrate Jira Cloud with your organization account to scan commits and pull requests, creating relevant metadata and hyperlinks in any mentioned Jira issues.' redirect_from: - /articles/integrating-jira-with-your-organization-project-board + - /github/setting-up-and-managing-organizations-and-teams/integrating-jira-with-your-organization-project-board versions: enterprise-server: '*' github-ae: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-default-labels-for-repositories-in-your-organization.md b/content/organizations/managing-organization-settings/managing-default-labels-for-repositories-in-your-organization.md similarity index 95% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-default-labels-for-repositories-in-your-organization.md rename to content/organizations/managing-organization-settings/managing-default-labels-for-repositories-in-your-organization.md index 7ec3f9f8c4..6392e569c0 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-default-labels-for-repositories-in-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-default-labels-for-repositories-in-your-organization.md @@ -3,6 +3,7 @@ title: Managing default labels for repositories in your organization intro: You can customize the labels that are included in every new repository in your organization. redirect_from: - /articles/managing-default-labels-for-repositories-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/managing-default-labels-for-repositories-in-your-organization versions: free-pro-team: '*' enterprise-server: '>=2.20' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-discussion-creation-for-repositories-in-your-organization.md b/content/organizations/managing-organization-settings/managing-discussion-creation-for-repositories-in-your-organization.md similarity index 91% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-discussion-creation-for-repositories-in-your-organization.md rename to content/organizations/managing-organization-settings/managing-discussion-creation-for-repositories-in-your-organization.md index 59557ff8e9..6a193d77a0 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-discussion-creation-for-repositories-in-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-discussion-creation-for-repositories-in-your-organization.md @@ -1,6 +1,8 @@ --- title: Managing discussion creation for repositories in your organization intro: You can choose the permission levels that members require to create discussions in repositories owned by your organization. +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/managing-discussion-creation-for-repositories-in-your-organization permissions: Organization owners can manage discussion creation for repositories owned by the organization. versions: free-pro-team: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-organization.md b/content/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization.md similarity index 91% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-organization.md rename to content/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization.md index 1d046ad5ee..40031825db 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization.md @@ -1,6 +1,8 @@ --- title: Managing scheduled reminders for your organization intro: You can get reminders in Slack for all pull requests that teams in your organization have been requested to review. +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-organization versions: free-pro-team: '*' topics: @@ -62,4 +64,4 @@ Organization owners can schedule a reminder for one or more teams in their organ ### Further reading - "[Managing your scheduled reminders](/github/setting-up-and-managing-your-github-user-account/managing-your-scheduled-reminders)" -- "[Managing scheduled reminders for your team](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-team)" +- "[Managing scheduled reminders for your team](/organizations/organizing-members-into-teams/managing-scheduled-reminders-for-your-team)" diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization.md b/content/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization.md similarity index 94% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization.md rename to content/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization.md index d0c412bd38..e92f24b39b 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization.md @@ -1,6 +1,8 @@ --- title: Managing the default branch name for repositories in your organization intro: 'You can set the default branch name for repositories that members create in your organization on {% data variables.product.product_location %}.' +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization permissions: Organization owners can manage the default branch name for new repositories in the organization. versions: free-pro-team: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-the-display-of-member-names-in-your-organization.md b/content/organizations/managing-organization-settings/managing-the-display-of-member-names-in-your-organization.md similarity index 92% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-the-display-of-member-names-in-your-organization.md rename to content/organizations/managing-organization-settings/managing-the-display-of-member-names-in-your-organization.md index 2ea1724010..792d2ee771 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-the-display-of-member-names-in-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-the-display-of-member-names-in-your-organization.md @@ -4,6 +4,7 @@ intro: You can allow members of your organization to see a comment author's prof product: '{% data reusables.gated-features.display-names %}' redirect_from: - /articles/managing-the-display-of-member-names-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/managing-the-display-of-member-names-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization.md b/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md similarity index 95% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization.md rename to content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md index d0c4ef8fe6..705fe3f867 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization.md @@ -4,6 +4,7 @@ intro: 'You can can allow or prevent the forking of any private{% if currentVers redirect_from: - /articles/allowing-people-to-fork-private-repositories-in-your-organization - /github/setting-up-and-managing-organizations-and-teams/allowing-people-to-fork-private-repositories-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization permissions: Organization owners can manage the forking policy for an organization. versions: free-pro-team: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization.md b/content/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization.md similarity index 84% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization.md rename to content/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization.md index 77d90558d2..153a8dc7c0 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization.md +++ b/content/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization.md @@ -9,16 +9,17 @@ versions: github-ae: '*' redirect_from: - /github/setting-up-and-managing-organizations-and-teams/disabling-publication-of-github-pages-sites-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization topics: - organizations - teams --- {% if currentVersion == "free-pro-team@latest" %} -If your organization uses {% data variables.product.prodname_ghe_cloud %}, you can choose to allow organization members to create publicly published sites, privately published sites, both, or neither. Otherwise, you can choose to allow or disallow public publishing. For more information about access control for {% data variables.product.prodname_pages %} sites, see "[Changing the visibility of your {% data variables.product.prodname_pages %} site](/github/working-with-github-pages/changing-the-visibility-of-your-github-pages-site)." +If your organization uses {% data variables.product.prodname_ghe_cloud %}, you can choose to allow organization members to create publicly published sites, privately published sites, both, or neither. Otherwise, you can choose to allow or disallow public publishing. For more information about access control for {% data variables.product.prodname_pages %} sites, see "[Changing the visibility of your {% data variables.product.prodname_pages %} site](/pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site)." {% endif %} -If you disallow publication of {% data variables.product.prodname_pages %} sites, any sites that are already published will remain published. You can manually unpublish the site. For more information, see "[Unpublishing a {% data variables.product.prodname_pages %} site](/github/working-with-github-pages/unpublishing-a-github-pages-site)." +If you disallow publication of {% data variables.product.prodname_pages %} sites, any sites that are already published will remain published. You can manually unpublish the site. For more information, see "[Unpublishing a {% data variables.product.prodname_pages %} site](/pages/getting-started-with-github-pages/unpublishing-a-github-pages-site)." {% data reusables.profile.access_profile %} {% data reusables.profile.access_org %} @@ -32,4 +33,4 @@ If you disallow publication of {% data variables.product.prodname_pages %} sites ### Further reading -- "[About {% data variables.product.prodname_pages %}](/github/working-with-github-pages/about-github-pages)" +- "[About {% data variables.product.prodname_pages %}](/pages/getting-started-with-github-pages/about-github-pages)" diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-updates-from-accounts-your-organization-sponsors.md b/content/organizations/managing-organization-settings/managing-updates-from-accounts-your-organization-sponsors.md similarity index 92% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-updates-from-accounts-your-organization-sponsors.md rename to content/organizations/managing-organization-settings/managing-updates-from-accounts-your-organization-sponsors.md index d849f0d8b8..a3e01ff5a7 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-updates-from-accounts-your-organization-sponsors.md +++ b/content/organizations/managing-organization-settings/managing-updates-from-accounts-your-organization-sponsors.md @@ -1,6 +1,8 @@ --- title: Managing updates from accounts your organization sponsors intro: You can manage the email address that receives updates from accounts your organization sponsors. +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/managing-updates-from-accounts-your-organization-sponsors versions: free-pro-team: '*' permissions: Organization owners can manage updates from accounts the organization sponsors. diff --git a/content/github/setting-up-and-managing-organizations-and-teams/renaming-an-organization.md b/content/organizations/managing-organization-settings/renaming-an-organization.md similarity index 79% rename from content/github/setting-up-and-managing-organizations-and-teams/renaming-an-organization.md rename to content/organizations/managing-organization-settings/renaming-an-organization.md index 9a63d45940..238a4c1df0 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/renaming-an-organization.md +++ b/content/organizations/managing-organization-settings/renaming-an-organization.md @@ -4,6 +4,7 @@ intro: 'If your project or company has changed names, you can update the name of redirect_from: - /articles/what-happens-when-i-change-my-organization-s-name/ - /articles/renaming-an-organization + - /github/setting-up-and-managing-organizations-and-teams/renaming-an-organization versions: free-pro-team: '*' enterprise-server: '*' @@ -34,7 +35,8 @@ After changing your organization's name, your old organization name becomes avai After changing your organization's name: - Links to your previous organization profile page, such as `https://{% data variables.command_line.backticks %}/previousorgname`, will return a 404 error. We recommend you update links to your organization from other sites{% if currentVersion == "free-pro-team@latest" %}, such as your LinkedIn or Twitter profiles{% endif %}. - API requests that use the old organization's name will return a 404 error. We recommend you update the old organization name in your API requests. -- There are no automatic [@mention](/articles/basic-writing-and-formatting-syntax/#mentioning-people-and-teams) redirects for teams that use the old organization's name. +- There are no automatic [@mention](/articles/basic-writing-and-formatting-syntax/#mentioning-people-and-teams) redirects for teams that use the old organization's name.{% if currentVersion == "free-pro-team@latest" %} +- If SAML single sign-on (SSO) is enabled for the organization, you must update the organization name in the application for {% data variables.product.prodname_ghe_cloud %} on your identity provider (IdP). If you don't update the organization name on your IdP, members of the organization will no longer be able to authenticate with your IdP to access the organization's resources. For more information, see "[Connecting your identity provider to your organization](/github/setting-up-and-managing-organizations-and-teams/connecting-your-identity-provider-to-your-organization)."{% endif %} ### Changing your organization's name diff --git a/content/github/setting-up-and-managing-organizations-and-teams/restricting-repository-creation-in-your-organization.md b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md similarity index 90% rename from content/github/setting-up-and-managing-organizations-and-teams/restricting-repository-creation-in-your-organization.md rename to content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md index 8c3dd0b4e0..330971580a 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/restricting-repository-creation-in-your-organization.md +++ b/content/organizations/managing-organization-settings/restricting-repository-creation-in-your-organization.md @@ -3,6 +3,7 @@ title: Restricting repository creation in your organization intro: 'To protect your organization''s data, you can configure permissions for creating repositories in your organization.' redirect_from: - /articles/restricting-repository-creation-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/restricting-repository-creation-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' @@ -20,7 +21,7 @@ Organization owners can always create any type of repository. {% warning %} -**Warning**: This setting only restricts the visibility options available when repositories are created and does not restrict the ability to change repository visibility at a later time. For more information about restricting changes to existing repositories' visibilities, see "[Restricting repository visibility changes in your organization](/github/setting-up-and-managing-organizations-and-teams/restricting-repository-visibility-changes-in-your-organization)." +**Warning**: This setting only restricts the visibility options available when repositories are created and does not restrict the ability to change repository visibility at a later time. For more information about restricting changes to existing repositories' visibilities, see "[Restricting repository visibility changes in your organization](/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization)." {% endwarning %} diff --git a/content/github/setting-up-and-managing-organizations-and-teams/restricting-repository-visibility-changes-in-your-organization.md b/content/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/restricting-repository-visibility-changes-in-your-organization.md rename to content/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization.md index 0e9ff0ecde..f6beab6468 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/restricting-repository-visibility-changes-in-your-organization.md +++ b/content/organizations/managing-organization-settings/restricting-repository-visibility-changes-in-your-organization.md @@ -3,6 +3,7 @@ title: Restricting repository visibility changes in your organization intro: 'To protect your organization''s data, you can configure permissions for changing repository visibility in your organization.' redirect_from: - /articles/restricting-repository-visibility-changes-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/restricting-repository-visibility-changes-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators.md b/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators.md rename to content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md index 118d2a24a5..266479e4f3 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators.md +++ b/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md @@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.restict-add-collaborator %}' redirect_from: - /articles/restricting-the-ability-to-add-outside-collaborators-to-organization-repositories/ - /articles/setting-permissions-for-adding-outside-collaborators + - /github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-adding-outside-collaborators versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-deleting-or-transferring-repositories.md b/content/organizations/managing-organization-settings/setting-permissions-for-deleting-or-transferring-repositories.md similarity index 90% rename from content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-deleting-or-transferring-repositories.md rename to content/organizations/managing-organization-settings/setting-permissions-for-deleting-or-transferring-repositories.md index aaa629acd2..ad92065f80 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-deleting-or-transferring-repositories.md +++ b/content/organizations/managing-organization-settings/setting-permissions-for-deleting-or-transferring-repositories.md @@ -4,6 +4,7 @@ intro: 'You can allow organization members with admin permissions to a repositor redirect_from: - /articles/setting-permissions-for-deleting-or-transferring-repositories-in-your-organization/ - /articles/setting-permissions-for-deleting-or-transferring-repositories + - /github/setting-up-and-managing-organizations-and-teams/setting-permissions-for-deleting-or-transferring-repositories versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/setting-team-creation-permissions-in-your-organization.md b/content/organizations/managing-organization-settings/setting-team-creation-permissions-in-your-organization.md similarity index 89% rename from content/github/setting-up-and-managing-organizations-and-teams/setting-team-creation-permissions-in-your-organization.md rename to content/organizations/managing-organization-settings/setting-team-creation-permissions-in-your-organization.md index 522a15d7f5..aef8790320 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/setting-team-creation-permissions-in-your-organization.md +++ b/content/organizations/managing-organization-settings/setting-team-creation-permissions-in-your-organization.md @@ -3,6 +3,7 @@ title: Setting team creation permissions in your organization intro: You can allow all organization members to create teams or limit team creation to organization owners. redirect_from: - /articles/setting-team-creation-permissions-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/setting-team-creation-permissions-in-your-organization versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/transferring-organization-ownership.md b/content/organizations/managing-organization-settings/transferring-organization-ownership.md similarity index 84% rename from content/github/setting-up-and-managing-organizations-and-teams/transferring-organization-ownership.md rename to content/organizations/managing-organization-settings/transferring-organization-ownership.md index 1fc1cea562..36919bf9d1 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/transferring-organization-ownership.md +++ b/content/organizations/managing-organization-settings/transferring-organization-ownership.md @@ -1,9 +1,10 @@ --- title: Transferring organization ownership +intro: 'To make someone else the owner of an organization account, you must add a new owner{% if currentVersion == "free-pro-team@latest" %}, ensure that the billing information is updated,{% endif %} and then remove yourself from the account.' redirect_from: - /articles/needs-polish-how-do-i-give-ownership-to-an-organization-to-someone-else/ - /articles/transferring-organization-ownership -intro: 'To make someone else the owner of an organization account, you must add a new owner{% if currentVersion == "free-pro-team@latest" %}, ensure that the billing information is updated,{% endif %} and then remove yourself from the account.' + - /github/setting-up-and-managing-organizations-and-teams/transferring-organization-ownership versions: free-pro-team: '*' enterprise-server: '*' @@ -13,7 +14,7 @@ topics: - teams --- -1. If you're the only member with *owner* privileges, give another organization member the owner role. For more information, see "[Appointing an organization owner](/github/setting-up-and-managing-organizations-and-teams/maintaining-ownership-continuity-for-your-organization#appointing-an-organization-owner)." +1. If you're the only member with *owner* privileges, give another organization member the owner role. For more information, see "[Appointing an organization owner](/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization#appointing-an-organization-owner)." 2. Contact the new owner and make sure he or she is able to [access the organization's settings](/articles/accessing-your-organization-s-settings). {% if currentVersion == "free-pro-team@latest" %} 3. If you are currently responsible for paying for GitHub in your organization, you'll also need to have the new owner or a [billing manager](/articles/adding-a-billing-manager-to-your-organization/) update the organization's payment information. For more information, see "[Adding or editing a payment method](/articles/adding-or-editing-a-payment-method)." diff --git a/content/github/setting-up-and-managing-organizations-and-teams/upgrading-to-the-corporate-terms-of-service.md b/content/organizations/managing-organization-settings/upgrading-to-the-corporate-terms-of-service.md similarity index 94% rename from content/github/setting-up-and-managing-organizations-and-teams/upgrading-to-the-corporate-terms-of-service.md rename to content/organizations/managing-organization-settings/upgrading-to-the-corporate-terms-of-service.md index 2d8302bb1d..21875d86ab 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/upgrading-to-the-corporate-terms-of-service.md +++ b/content/organizations/managing-organization-settings/upgrading-to-the-corporate-terms-of-service.md @@ -3,6 +3,7 @@ title: Upgrading to the Corporate Terms of Service intro: Organizations can upgrade from the Standard Terms of Service to the Corporate Terms of Service. redirect_from: - /articles/upgrading-to-the-corporate-terms-of-service + - /github/setting-up-and-managing-organizations-and-teams/upgrading-to-the-corporate-terms-of-service versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/verifying-your-organizations-domain.md b/content/organizations/managing-organization-settings/verifying-your-organizations-domain.md similarity index 97% rename from content/github/setting-up-and-managing-organizations-and-teams/verifying-your-organizations-domain.md rename to content/organizations/managing-organization-settings/verifying-your-organizations-domain.md index 2aaf181720..196904f48c 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/verifying-your-organizations-domain.md +++ b/content/organizations/managing-organization-settings/verifying-your-organizations-domain.md @@ -4,6 +4,7 @@ intro: 'You can verify the domains controlled by your organization to confirm yo redirect_from: - /articles/verifying-your-organization-s-domain - /articles/verifying-your-organizations-domain + - /github/setting-up-and-managing-organizations-and-teams/verifying-your-organizations-domain versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/adding-a-billing-manager-to-your-organization.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/adding-a-billing-manager-to-your-organization.md rename to content/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization.md index f9ae9677a0..f8b2075ce9 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/adding-a-billing-manager-to-your-organization.md +++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization.md @@ -3,6 +3,7 @@ title: Adding a billing manager to your organization intro: 'A *billing manager* is a user who manages the billing settings for your organization, such as updating payment information. This is a great option if regular members of your organization don''t typically have access to billing resources.' redirect_from: - /articles/adding-a-billing-manager-to-your-organization + - /github/setting-up-and-managing-organizations-and-teams/adding-a-billing-manager-to-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/giving-team-maintainer-permissions-to-an-organization-member.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/giving-team-maintainer-permissions-to-an-organization-member.md similarity index 92% rename from content/github/setting-up-and-managing-organizations-and-teams/giving-team-maintainer-permissions-to-an-organization-member.md rename to content/organizations/managing-peoples-access-to-your-organization-with-roles/giving-team-maintainer-permissions-to-an-organization-member.md index 5153f6a357..8a2a80a2a4 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/giving-team-maintainer-permissions-to-an-organization-member.md +++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/giving-team-maintainer-permissions-to-an-organization-member.md @@ -4,6 +4,7 @@ intro: 'An organization owner can promote any member of the organization to *tea redirect_from: - /articles/giving-team-maintainer-permissions-to-an-organization-member-early-access-program/ - /articles/giving-team-maintainer-permissions-to-an-organization-member + - /github/setting-up-and-managing-organizations-and-teams/giving-team-maintainer-permissions-to-an-organization-member versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-peoples-access-to-your-organization-with-roles.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/index.md similarity index 56% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-peoples-access-to-your-organization-with-roles.md rename to content/organizations/managing-peoples-access-to-your-organization-with-roles/index.md index 9d14684e91..a6fedeb7bc 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-peoples-access-to-your-organization-with-roles.md +++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/index.md @@ -4,7 +4,7 @@ intro: 'A person''s role in your organization defines their level of access to y redirect_from: - /articles/managing-people-s-access-to-your-organization-with-roles - /articles/managing-peoples-access-to-your-organization-with-roles -mapTopic: true + - /github/setting-up-and-managing-organizations-and-teams/managing-peoples-access-to-your-organization-with-roles versions: free-pro-team: '*' enterprise-server: '*' @@ -14,3 +14,8 @@ topics: - teams --- +{% link_in_list /permission-levels-for-an-organization %} +{% link_in_list /maintaining-ownership-continuity-for-your-organization %} +{% link_in_list /giving-team-maintainer-permissions-to-an-organization-member %} +{% link_in_list /adding-a-billing-manager-to-your-organization %} +{% link_in_list /removing-a-billing-manager-from-your-organization %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/maintaining-ownership-continuity-for-your-organization.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization.md similarity index 87% rename from content/github/setting-up-and-managing-organizations-and-teams/maintaining-ownership-continuity-for-your-organization.md rename to content/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization.md index 76c0456caa..870912c1b6 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/maintaining-ownership-continuity-for-your-organization.md +++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization.md @@ -5,6 +5,8 @@ redirect_from: - /articles/changing-a-person-s-role-to-owner - /articles/changing-a-persons-role-to-owner - /github/setting-up-and-managing-organizations-and-teams/changing-a-persons-role-to-owner + - /github/setting-up-and-managing-organizations-and-teams/managing-ownership-continuity-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/maintaining-ownership-continuity-for-your-organization permissions: Organization owners can promote any member of an organization to an organization owner. versions: free-pro-team: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/permission-levels-for-an-organization.md similarity index 83% rename from content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md rename to content/organizations/managing-peoples-access-to-your-organization-with-roles/permission-levels-for-an-organization.md index ae61a1ad66..818a082bfa 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md +++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/permission-levels-for-an-organization.md @@ -4,6 +4,7 @@ intro: 'After you [create an organization](/articles/creating-a-new-organization redirect_from: - /articles/permission-levels-for-an-organization-early-access-program/ - /articles/permission-levels-for-an-organization + - /github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization versions: free-pro-team: '*' enterprise-server: '*' @@ -17,7 +18,7 @@ topics: Organization members can have *owner*{% if currentVersion == "free-pro-team@latest" %}, *billing manager*,{% endif %} or *member* roles: -- **Owners** have complete administrative access to your organization. This role should be limited, but to no less than two people, in your organization. For more information, see "[Maintaining ownership continuity for your organization](/github/setting-up-and-managing-organizations-and-teams/maintaining-ownership-continuity-for-your-organization)." +- **Owners** have complete administrative access to your organization. This role should be limited, but to no less than two people, in your organization. For more information, see "[Maintaining ownership continuity for your organization](/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization)." {% if currentVersion == "free-pro-team@latest" %} - **Billing managers** allow a person to manage billing settings. For more information, see "[Adding a billing manager to your organization](/articles/adding-a-billing-manager-to-your-organization)". {% endif %} @@ -36,13 +37,13 @@ Organization members can have *owner*{% if currentVersion == "free-pro-team@late | Reinstate former members to the organization | **X** | | | | Add and remove people from **all teams** | **X** | | | | Promote organization members to *team maintainer* | **X** | | | -| Configure code review assignments (see "[Managing code review assignment for your team](/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team)") | **X** | | | +| Configure code review assignments (see "[Managing code review assignment for your team](/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team)") | **X** | | | | Set scheduled reminders (see "[Managing scheduled reminders for pull requests](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-pull-requests)") | **X** | | | | Add collaborators to **all repositories** | **X** | | | | Access the organization audit log | **X** | | | | Edit the organization's profile page (see "[About your organization's profile](/articles/about-your-organization-s-profile)" for details) | **X** | | | | Verify the organization's domains (see "[Verifying your organization's domain](/articles/verifying-your-organization-s-domain)" for details) | **X** | | | -| Restrict email notifications to verified domains (see "[Restricting email notifications to an approved domain](/github/setting-up-and-managing-organizations-and-teams/restricting-email-notifications-to-an-approved-domain)" for details) | **X** | | | +| Restrict email notifications to verified domains (see "[Restricting email notifications to an approved domain](/organizations/keeping-your-organization-secure/restricting-email-notifications-to-an-approved-domain)" for details) | **X** | | | | Delete **all teams** | **X** | | | | Delete the organization account, including all repositories | **X** | | | | Create teams (see "[Setting team creation permissions in your organization](/articles/setting-team-creation-permissions-in-your-organization)" for details) | **X** | **X** | | @@ -52,35 +53,35 @@ Organization members can have *owner*{% if currentVersion == "free-pro-team@late | @mention any visible team | **X** | **X** | | | Can be made a *team maintainer* | **X** | **X** | | | View organization insights (see "[Viewing insights for your organization](/articles/viewing-insights-for-your-organization)" for details) | **X** | **X** | | -| View and post public team discussions to **all teams** (see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)" for details) | **X** | **X** | | -| View and post private team discussions to **all teams** (see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)" for details) | **X** | | | +| View and post public team discussions to **all teams** (see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)" for details) | **X** | **X** | | +| View and post private team discussions to **all teams** (see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)" for details) | **X** | | | | Edit and delete team discussions in **all teams** (see "[Managing disruptive comments](/communities/moderating-comments-and-conversations/managing-disruptive-comments)" for details) | **X** | | | | Hide comments on commits, pull requests, and issues (see "[Managing disruptive comments](/communities/moderating-comments-and-conversations/managing-disruptive-comments/#hiding-a-comment)" for details) | **X** | **X** | | | Disable team discussions for an organization (see "[Disabling team discussions for your organization](/articles/disabling-team-discussions-for-your-organization)" for details) | **X** | | | | Manage viewing of organization dependency insights (see "[Changing the visibility of your organization's dependency insights](/articles/changing-the-visibility-of-your-organizations-dependency-insights)" for details) | **X** | | | | Set a team profile picture in **all teams** (see "[Setting your team's profile picture](/articles/setting-your-team-s-profile-picture)" for details) | **X** | | | | Sponsor accounts and manage the organization's sponsorships (see "[Sponsoring open-source contributors](/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-open-source-contributors)" for details) | **X** | **X** | | -| Manage email updates from sponsored accounts (see "[Managing updates from accounts your organization's sponsors](/github/setting-up-and-managing-organizations-and-teams/managing-updates-from-accounts-your-organization-sponsors)" for details) | **X** | | | +| Manage email updates from sponsored accounts (see "[Managing updates from accounts your organization's sponsors](/organizations/managing-organization-settings/managing-updates-from-accounts-your-organization-sponsors)" for details) | **X** | | | | Attribute your sponsorships to another organization (see "[Attributing sponsorships to your organization](/github/supporting-the-open-source-community-with-github-sponsors/attributing-sponsorships-to-your-organization)" for details ) | **X** | | | -| Manage the publication of {% data variables.product.prodname_pages %} sites from repositories in the organization (see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization)" for details) | **X** | | | -| Manage security and analysis settings (see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)" for details) | **X** | | | +| Manage the publication of {% data variables.product.prodname_pages %} sites from repositories in the organization (see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)" for details) | **X** | | | +| Manage security and analysis settings (see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)" for details) | **X** | | | | Enable and enforce [SAML single sign-on](/articles/about-identity-and-access-management-with-saml-single-sign-on) | **X** | | | -| [Manage a user's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization) | **X** | | | +| [Manage a user's SAML access to your organization](/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization) | **X** | | | | Manage an organization's SSH certificate authorities (see "[Managing your organization's SSH certificate authorities](/articles/managing-your-organizations-ssh-certificate-authorities)" for details) | **X** | | | | Transfer repositories | **X** | | | | Purchase, install, manage billing for, and cancel {% data variables.product.prodname_marketplace %} apps | **X** | | | | List apps in {% data variables.product.prodname_marketplace %} | **X** | | | | Receive [{% data variables.product.prodname_dependabot_alerts %} about vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) for all of an organization's repositories | **X** | | | | Manage {% data variables.product.prodname_dependabot_security_updates %} (see "[About {% data variables.product.prodname_dependabot_security_updates %}](/github/managing-security-vulnerabilities/about-dependabot-security-updates)") | **X** | | | -| [Manage the forking policy](/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization) | **X** | | | +| [Manage the forking policy](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization) | **X** | | | | [Limit activity in public repositories in an organization](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-organization) | **X** | | | | Pull (read), push (write), and clone (copy) *all repositories* in the organization | **X** | | | | Convert organization members to [outside collaborators](#outside-collaborators) | **X** | | | | [View people with access to an organization repository](/articles/viewing-people-with-access-to-your-repository) | **X** | | | | [Export a list of people with access to an organization repository](/articles/viewing-people-with-access-to-your-repository/#exporting-a-list-of-people-with-access-to-your-repository) | **X** | | | -| Manage the default branch name (see "[Managing the default branch name for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)") | **X** | | | +| Manage the default branch name (see "[Managing the default branch name for repositories in your organization](/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization)") | **X** | | | | Manage default labels (see "[Managing default labels for repositories in your organization](/articles/managing-default-labels-for-repositories-in-your-organization)") | **X** | | | -| Enable team synchronization (see "[Managing team synchronization for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-team-synchronization-for-your-organization)" for details) | **X** | | | +| Enable team synchronization (see "[Managing team synchronization for your organization](/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization)" for details) | **X** | | | {% else %} @@ -93,7 +94,7 @@ Organization members can have *owner*{% if currentVersion == "free-pro-team@late | Reinstate former members to the organization | **X** | | | | Add and remove people from **all teams** | **X** | | | Promote organization members to *team maintainer* | **X** | |{% if currentVersion ver_gt "enterprise-server@2.19" or currentVersion == "github-ae@latest" %} -| Configure code review assignments (see "[Managing code review assignment for your team](/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team)") | **X** | |{% endif %} +| Configure code review assignments (see "[Managing code review assignment for your team](/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team)") | **X** | |{% endif %} | Add collaborators to **all repositories** | **X** | | | Access the organization audit log | **X** | | | Edit the organization's profile page (see "[About your organization's profile](/articles/about-your-organization-s-profile)" for details) | **X** | | | @@ -106,13 +107,13 @@ Organization members can have *owner*{% if currentVersion == "free-pro-team@late | Transfer repositories | **X** | | | Manage an organization's SSH certificate authorities (see "[Managing your organization's SSH certificate authorities](/articles/managing-your-organizations-ssh-certificate-authorities)" for details) | **X** | | | Create project boards (see "[Project board permissions for an organization](/articles/project-board-permissions-for-an-organization)" for details) | **X** | **X** | | -| View and post public team discussions to **all teams** (see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)" for details) | **X** | **X** | | -| View and post private team discussions to **all teams** (see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)" for details) | **X** | | | +| View and post public team discussions to **all teams** (see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)" for details) | **X** | **X** | | +| View and post private team discussions to **all teams** (see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)" for details) | **X** | | | | Edit and delete team discussions in **all teams** (for more information, see "[Managing disruptive comments](/communities/moderating-comments-and-conversations/managing-disruptive-comments)) | **X** | | | | Hide comments on commits, pull requests, and issues (see "[Managing disruptive comments](/communities/moderating-comments-and-conversations/managing-disruptive-comments/#hiding-a-comment)" for details) | **X** | **X** | **X** | | Disable team discussions for an organization (see "[Disabling team discussions for your organization](/articles/disabling-team-discussions-for-your-organization)" for details) | **X** | | | | Set a team profile picture in **all teams** (see "[Setting your team's profile picture](/articles/setting-your-team-s-profile-picture)" for details) | **X** | | |{% if currentVersion ver_gt "enterprise-server@3.0" %} -| Manage the publication of {% data variables.product.prodname_pages %} sites from repositories in the organization (see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization)" for details) | **X** | |{% endif %} +| Manage the publication of {% data variables.product.prodname_pages %} sites from repositories in the organization (see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)" for details) | **X** | |{% endif %} | [Move teams in an organization's hierarchy](/articles/moving-a-team-in-your-organization-s-hierarchy) | **X** | | | | Pull (read), push (write), and clone (copy) *all repositories* in the organization | **X** | | | Convert organization members to [outside collaborators](#outside-collaborators) | **X** | | diff --git a/content/github/setting-up-and-managing-organizations-and-teams/removing-a-billing-manager-from-your-organization.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/removing-a-billing-manager-from-your-organization.md similarity index 89% rename from content/github/setting-up-and-managing-organizations-and-teams/removing-a-billing-manager-from-your-organization.md rename to content/organizations/managing-peoples-access-to-your-organization-with-roles/removing-a-billing-manager-from-your-organization.md index cc855248da..aa6186ab70 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/removing-a-billing-manager-from-your-organization.md +++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/removing-a-billing-manager-from-your-organization.md @@ -3,6 +3,7 @@ title: Removing a billing manager from your organization intro: 'If a person with the *billing manager* role no longer needs to view or change your organization''s billing information, you can remove their access to the organization.' redirect_from: - /articles/removing-a-billing-manager-from-your-organization + - /github/setting-up-and-managing-organizations-and-teams/removing-a-billing-manager-from-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/about-identity-and-access-management-with-saml-single-sign-on.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/about-identity-and-access-management-with-saml-single-sign-on.md similarity index 87% rename from content/github/setting-up-and-managing-organizations-and-teams/about-identity-and-access-management-with-saml-single-sign-on.md rename to content/organizations/managing-saml-single-sign-on-for-your-organization/about-identity-and-access-management-with-saml-single-sign-on.md index 154855ba68..683f583260 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/about-identity-and-access-management-with-saml-single-sign-on.md +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/about-identity-and-access-management-with-saml-single-sign-on.md @@ -4,6 +4,7 @@ intro: 'If you centrally manage your users'' identities and applications with an product: '{% data reusables.gated-features.saml-sso %}' redirect_from: - /articles/about-identity-and-access-management-with-saml-single-sign-on + - /github/setting-up-and-managing-organizations-and-teams/about-identity-and-access-management-with-saml-single-sign-on versions: free-pro-team: '*' topics: @@ -21,7 +22,7 @@ Organization owners can enforce SAML SSO for an individual organization, or ente {% data reusables.saml.outside-collaborators-exemption %} -Before enabling SAML SSO for your organization, you'll need to connect your IdP to your organization. For more information, see "[Connecting your identity provider to your organization](/github/setting-up-and-managing-organizations-and-teams/connecting-your-identity-provider-to-your-organization)." +Before enabling SAML SSO for your organization, you'll need to connect your IdP to your organization. For more information, see "[Connecting your identity provider to your organization](/organizations/managing-saml-single-sign-on-for-your-organization/connecting-your-identity-provider-to-your-organization)." For an organization, SAML SSO can be disabled, enabled but not enforced, or enabled and enforced. After you enable SAML SSO for your organization and your organization's members successfully authenticate with your IdP, you can enforce the SAML SSO configuration. For more information about enforcing SAML SSO for your {% data variables.product.prodname_dotcom %} organization, see "[Enforcing SAML single sign-on for your organization](/articles/enforcing-saml-single-sign-on-for-your-organization)." @@ -29,7 +30,7 @@ Members must periodically authenticate with your IdP to authenticate and gain ac To access the organization's protected resources using the API and Git on the command line, members must authorize and authenticate with a personal access token or SSH key. For more information, see "[Authorizing a personal access token for use with SAML single sign-on](/github/authenticating-to-github/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on)" and "[Authorizing an SSH key for use with SAML single sign-on](/github/authenticating-to-github/authorizing-an-ssh-key-for-use-with-saml-single-sign-on)." -The first time a member uses SAML SSO to access your organization, {% data variables.product.prodname_dotcom %} automatically creates a record that links your organization, the member's {% data variables.product.prodname_dotcom %} account, and the member's account on your IdP. You can view and revoke the linked SAML identity, active sessions, and authorized credentials for members of your organization or enterprise account. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization)" and "[Viewing and managing a user's SAML access to your enterprise account](/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise-account)." +The first time a member uses SAML SSO to access your organization, {% data variables.product.prodname_dotcom %} automatically creates a record that links your organization, the member's {% data variables.product.prodname_dotcom %} account, and the member's account on your IdP. You can view and revoke the linked SAML identity, active sessions, and authorized credentials for members of your organization or enterprise account. For more information, see "[Viewing and managing a member's SAML access to your organization](/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization)" and "[Viewing and managing a user's SAML access to your enterprise account](/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise-account)." If members are signed in with a SAML SSO session when they create a new repository, the default visibility of that repository is private. Otherwise, the default visibility is public. For more information on repository visibility, see "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)." @@ -41,7 +42,7 @@ Organization members must also have an active SAML session to authorize an {% da {% data reusables.saml.saml-supported-idps %} -Some IdPs support provisioning access to a {% data variables.product.prodname_dotcom %} organization via SCIM. For more information, see "[About SCIM](/github/setting-up-and-managing-organizations-and-teams/about-scim)." +Some IdPs support provisioning access to a {% data variables.product.prodname_dotcom %} organization via SCIM. For more information, see "[About SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)." ### Adding members to an organization using SAML SSO @@ -49,7 +50,7 @@ After you enable SAML SSO, there are multiple ways you can add new members to yo To provision new users without an invitation from an organization owner, you can use the URL `https://github.com/orgs/ORGANIZATION/sso/sign_up`, replacing _ORGANIZATION_ with the name of your organization. For example, you can configure your IdP so that anyone with access to the IdP can click a link on the IdP's dashboard to join your {% data variables.product.prodname_dotcom %} organization. -If your IdP supports SCIM, {% data variables.product.prodname_dotcom %} can automatically invite members to join your organization when you grant access on your IdP. If you remove a member's access to your {% data variables.product.prodname_dotcom %} organization on your SAML IdP, the member will be automatically removed from the {% data variables.product.prodname_dotcom %} organization. For more information, see "[About SCIM](/github/setting-up-and-managing-organizations-and-teams/about-scim)." +If your IdP supports SCIM, {% data variables.product.prodname_dotcom %} can automatically invite members to join your organization when you grant access on your IdP. If you remove a member's access to your {% data variables.product.prodname_dotcom %} organization on your SAML IdP, the member will be automatically removed from the {% data variables.product.prodname_dotcom %} organization. For more information, see "[About SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)." {% data reusables.organizations.team-synchronization %} diff --git a/content/github/setting-up-and-managing-organizations-and-teams/about-scim.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/about-scim.md similarity index 97% rename from content/github/setting-up-and-managing-organizations-and-teams/about-scim.md rename to content/organizations/managing-saml-single-sign-on-for-your-organization/about-scim.md index 36f06c2387..f2803a2adc 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/about-scim.md +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/about-scim.md @@ -4,6 +4,7 @@ intro: 'With System for Cross-domain Identity Management (SCIM), administrators product: '{% data reusables.gated-features.saml-sso %}' redirect_from: - /articles/about-scim + - /github/setting-up-and-managing-organizations-and-teams/about-scim versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/accessing-your-organization-if-your-identity-provider-is-unavailable.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/accessing-your-organization-if-your-identity-provider-is-unavailable.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/accessing-your-organization-if-your-identity-provider-is-unavailable.md rename to content/organizations/managing-saml-single-sign-on-for-your-organization/accessing-your-organization-if-your-identity-provider-is-unavailable.md index 6cea7ad0bd..799e031b02 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/accessing-your-organization-if-your-identity-provider-is-unavailable.md +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/accessing-your-organization-if-your-identity-provider-is-unavailable.md @@ -4,6 +4,7 @@ intro: 'Organization administrators can sign into {% data variables.product.prod product: '{% data reusables.gated-features.saml-sso %}' redirect_from: - /articles/accessing-your-organization-if-your-identity-provider-is-unavailable + - /github/setting-up-and-managing-organizations-and-teams/accessing-your-organization-if-your-identity-provider-is-unavailable versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/configuring-saml-single-sign-on-and-scim-using-okta.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/configuring-saml-single-sign-on-and-scim-using-okta.md similarity index 87% rename from content/github/setting-up-and-managing-organizations-and-teams/configuring-saml-single-sign-on-and-scim-using-okta.md rename to content/organizations/managing-saml-single-sign-on-for-your-organization/configuring-saml-single-sign-on-and-scim-using-okta.md index effe8a36c8..f2cb111b81 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/configuring-saml-single-sign-on-and-scim-using-okta.md +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/configuring-saml-single-sign-on-and-scim-using-okta.md @@ -1,6 +1,8 @@ --- title: Configuring SAML single sign-on and SCIM using Okta intro: 'You can use Security Assertion Markup Language (SAML) single sign-on (SSO) and System for Cross-domain Identity Management (SCIM) with Okta to automatically manage access to your organization on {% data variables.product.prodname_dotcom %}.' +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/configuring-saml-single-sign-on-and-scim-using-okta product: '{% data reusables.gated-features.saml-sso %}' permissions: Organization owners can configure SAML SSO and SCIM using Okta for an organization. versions: @@ -14,7 +16,7 @@ topics: You can control access to your {% data variables.product.prodname_dotcom %} organization and other web applications from one central interface by configuring the organization to use SAML SSO and SCIM with Okta, an Identity Provider (IdP). -SAML SSO controls and secures access to organization resources like repositories, issues, and pull requests. SCIM automatically adds, manages, and removes members' access to your {% data variables.product.prodname_dotcom %} organization when you make changes in Okta. For more information, see "[About identity and access management with SAML single sign-on](/github/setting-up-and-managing-organizations-and-teams/about-identity-and-access-management-with-saml-single-sign-on)" and "[About SCIM](/github/setting-up-and-managing-organizations-and-teams/about-scim)." +SAML SSO controls and secures access to organization resources like repositories, issues, and pull requests. SCIM automatically adds, manages, and removes members' access to your {% data variables.product.prodname_dotcom %} organization when you make changes in Okta. For more information, see "[About identity and access management with SAML single sign-on](/organizations/managing-saml-single-sign-on-for-your-organization/about-identity-and-access-management-with-saml-single-sign-on)" and "[About SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)." After you enable SCIM, the following provisioning features are available for any users that you assign your {% data variables.product.prodname_ghe_cloud %} application to in Okta. @@ -49,7 +51,7 @@ After you enable SCIM, the following provisioning features are available for any {% data reusables.saml.assign-yourself-to-okta %} {% data reusables.saml.okta-sign-on-tab %} {% data reusables.saml.okta-view-setup-instructions %} -6. Enable and test SAML SSO on {% data variables.product.prodname_dotcom %} using the sign on URL, issuer URL, and public certificates from the "How to Configure SAML 2.0" guide. For more information, see "[Enabling and testing SAML single sign-on for your organization](/github/setting-up-and-managing-organizations-and-teams/enabling-and-testing-saml-single-sign-on-for-your-organization)." +6. Enable and test SAML SSO on {% data variables.product.prodname_dotcom %} using the sign on URL, issuer URL, and public certificates from the "How to Configure SAML 2.0" guide. For more information, see "[Enabling and testing SAML single sign-on for your organization](/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization)." ### Configuring access provisioning with SCIM in Okta @@ -79,6 +81,6 @@ After you enable SCIM, the following provisioning features are available for any ### Further reading - "[Configuring SAML single sign-on and SCIM for your enterprise account using Okta](/github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-and-scim-for-your-enterprise-account-using-okta)" -- "[Managing team synchronization for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-team-synchronization-for-your-organization#enabling-team-synchronization-for-okta)" +- "[Managing team synchronization for your organization](/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization#enabling-team-synchronization-for-okta)" - [Understanding SAML](https://developer.okta.com/docs/concepts/saml/) in the Okta documentation - [Understanding SCIM](https://developer.okta.com/docs/concepts/scim/) in the Okta documentation diff --git a/content/github/setting-up-and-managing-organizations-and-teams/connecting-your-identity-provider-to-your-organization.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/connecting-your-identity-provider-to-your-organization.md similarity index 95% rename from content/github/setting-up-and-managing-organizations-and-teams/connecting-your-identity-provider-to-your-organization.md rename to content/organizations/managing-saml-single-sign-on-for-your-organization/connecting-your-identity-provider-to-your-organization.md index 1196bdc9b3..a8c18184eb 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/connecting-your-identity-provider-to-your-organization.md +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/connecting-your-identity-provider-to-your-organization.md @@ -4,6 +4,7 @@ intro: 'To use SAML single sign-on and SCIM, you must connect your identity prov product: '{% data reusables.gated-features.saml-sso %}' redirect_from: - /articles/connecting-your-identity-provider-to-your-organization + - /github/setting-up-and-managing-organizations-and-teams/connecting-your-identity-provider-to-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/downloading-your-organizations-saml-single-sign-on-recovery-codes.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/downloading-your-organizations-saml-single-sign-on-recovery-codes.md similarity index 94% rename from content/github/setting-up-and-managing-organizations-and-teams/downloading-your-organizations-saml-single-sign-on-recovery-codes.md rename to content/organizations/managing-saml-single-sign-on-for-your-organization/downloading-your-organizations-saml-single-sign-on-recovery-codes.md index fe2af11379..1a5907b496 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/downloading-your-organizations-saml-single-sign-on-recovery-codes.md +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/downloading-your-organizations-saml-single-sign-on-recovery-codes.md @@ -4,6 +4,7 @@ intro: 'Organization administrators should download their organization''s SAML s redirect_from: - /articles/downloading-your-organization-s-saml-single-sign-on-recovery-codes - /articles/downloading-your-organizations-saml-single-sign-on-recovery-codes + - /github/setting-up-and-managing-organizations-and-teams/downloading-your-organizations-saml-single-sign-on-recovery-codes product: '{% data reusables.gated-features.saml-sso %}' versions: free-pro-team: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/enabling-and-testing-saml-single-sign-on-for-your-organization.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md similarity index 97% rename from content/github/setting-up-and-managing-organizations-and-teams/enabling-and-testing-saml-single-sign-on-for-your-organization.md rename to content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md index 8f3fc489a1..e5084e8f26 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/enabling-and-testing-saml-single-sign-on-for-your-organization.md +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md @@ -4,6 +4,7 @@ intro: Organization owners and admins can enable SAML single sign-on to add an e product: '{% data reusables.gated-features.saml-sso %}' redirect_from: - /articles/enabling-and-testing-saml-single-sign-on-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/enabling-and-testing-saml-single-sign-on-for-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/enforcing-saml-single-sign-on-for-your-organization.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/enforcing-saml-single-sign-on-for-your-organization.md similarity index 95% rename from content/github/setting-up-and-managing-organizations-and-teams/enforcing-saml-single-sign-on-for-your-organization.md rename to content/organizations/managing-saml-single-sign-on-for-your-organization/enforcing-saml-single-sign-on-for-your-organization.md index 08241fc58b..65065df85a 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/enforcing-saml-single-sign-on-for-your-organization.md +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/enforcing-saml-single-sign-on-for-your-organization.md @@ -4,6 +4,7 @@ intro: Organization owners and admins can enforce SAML SSO so that all organizat product: '{% data reusables.gated-features.saml-sso %}' redirect_from: - /articles/enforcing-saml-single-sign-on-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/enforcing-saml-single-sign-on-for-your-organization versions: free-pro-team: '*' topics: diff --git a/content/organizations/managing-saml-single-sign-on-for-your-organization/index.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/index.md new file mode 100644 index 0000000000..6dc52297a3 --- /dev/null +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/index.md @@ -0,0 +1,24 @@ +--- +title: Managing SAML single sign-on for your organization +intro: Organization administrators can manage organization members' identities and access to the organization with SAML single sign-on (SSO). +redirect_from: + - /articles/managing-member-identity-and-access-in-your-organization-with-saml-single-sign-on/ + - /articles/managing-saml-single-sign-on-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/managing-saml-single-sign-on-for-your-organization +versions: + free-pro-team: '*' +topics: + - organizations + - teams +--- + +{% link_in_list /about-identity-and-access-management-with-saml-single-sign-on %} +{% link_in_list /about-scim %} +{% link_in_list /connecting-your-identity-provider-to-your-organization %} +{% link_in_list /configuring-saml-single-sign-on-and-scim-using-okta %} +{% link_in_list /enabling-and-testing-saml-single-sign-on-for-your-organization %} +{% link_in_list /preparing-to-enforce-saml-single-sign-on-in-your-organization %} +{% link_in_list /enforcing-saml-single-sign-on-for-your-organization %} +{% link_in_list /downloading-your-organizations-saml-single-sign-on-recovery-codes %} +{% link_in_list /managing-team-synchronization-for-your-organization %} +{% link_in_list /accessing-your-organization-if-your-identity-provider-is-unavailable %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-team-synchronization-for-your-organization.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization.md similarity index 97% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-team-synchronization-for-your-organization.md rename to content/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization.md index afbdb5dfe0..a12f67af14 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-team-synchronization-for-your-organization.md +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization.md @@ -6,6 +6,7 @@ redirect_from: - /articles/synchronizing-teams-between-your-identity-provider-and-github - /github/setting-up-and-managing-organizations-and-teams/synchronizing-teams-between-your-identity-provider-and-github - /github/articles/synchronizing-teams-between-okta-and-github + - /github/setting-up-and-managing-organizations-and-teams/managing-team-synchronization-for-your-organization permissions: Organization owners can manage team synchronization for an organization. miniTocMaxHeadingLevel: 4 versions: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/preparing-to-enforce-saml-single-sign-on-in-your-organization.md b/content/organizations/managing-saml-single-sign-on-for-your-organization/preparing-to-enforce-saml-single-sign-on-in-your-organization.md similarity index 92% rename from content/github/setting-up-and-managing-organizations-and-teams/preparing-to-enforce-saml-single-sign-on-in-your-organization.md rename to content/organizations/managing-saml-single-sign-on-for-your-organization/preparing-to-enforce-saml-single-sign-on-in-your-organization.md index c94b189833..0e370456c8 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/preparing-to-enforce-saml-single-sign-on-in-your-organization.md +++ b/content/organizations/managing-saml-single-sign-on-for-your-organization/preparing-to-enforce-saml-single-sign-on-in-your-organization.md @@ -4,6 +4,7 @@ intro: 'Before you enforce SAML single sign-on in your organization, you should product: '{% data reusables.gated-features.saml-sso %}' redirect_from: - /articles/preparing-to-enforce-saml-single-sign-on-in-your-organization + - /github/setting-up-and-managing-organizations-and-teams/preparing-to-enforce-saml-single-sign-on-in-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/converting-an-admin-team-to-improved-organization-permissions.md b/content/organizations/migrating-to-improved-organization-permissions/converting-an-admin-team-to-improved-organization-permissions.md similarity index 94% rename from content/github/setting-up-and-managing-organizations-and-teams/converting-an-admin-team-to-improved-organization-permissions.md rename to content/organizations/migrating-to-improved-organization-permissions/converting-an-admin-team-to-improved-organization-permissions.md index c706237e94..30f8dcea86 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/converting-an-admin-team-to-improved-organization-permissions.md +++ b/content/organizations/migrating-to-improved-organization-permissions/converting-an-admin-team-to-improved-organization-permissions.md @@ -4,6 +4,7 @@ intro: 'If your organization was created after September 2015, your organization redirect_from: - /articles/converting-your-previous-admin-team-to-the-improved-organization-permissions/ - /articles/converting-an-admin-team-to-improved-organization-permissions + - /github/setting-up-and-managing-organizations-and-teams/converting-an-admin-team-to-improved-organization-permissions versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/converting-an-owners-team-to-improved-organization-permissions.md b/content/organizations/migrating-to-improved-organization-permissions/converting-an-owners-team-to-improved-organization-permissions.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/converting-an-owners-team-to-improved-organization-permissions.md rename to content/organizations/migrating-to-improved-organization-permissions/converting-an-owners-team-to-improved-organization-permissions.md index 1caafa06b9..ea280612e1 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/converting-an-owners-team-to-improved-organization-permissions.md +++ b/content/organizations/migrating-to-improved-organization-permissions/converting-an-owners-team-to-improved-organization-permissions.md @@ -5,6 +5,7 @@ redirect_from: - /articles/converting-your-previous-owners-team-to-the-improved-organization-permissions-early-access-program/ - /articles/converting-your-previous-owners-team-to-the-improved-organization-permissions/ - /articles/converting-an-owners-team-to-improved-organization-permissions + - /github/setting-up-and-managing-organizations-and-teams/converting-an-owners-team-to-improved-organization-permissions versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/migrating-to-improved-organization-permissions.md b/content/organizations/migrating-to-improved-organization-permissions/index.md similarity index 66% rename from content/github/setting-up-and-managing-organizations-and-teams/migrating-to-improved-organization-permissions.md rename to content/organizations/migrating-to-improved-organization-permissions/index.md index ccaaf3494e..5a0539da2a 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/migrating-to-improved-organization-permissions.md +++ b/content/organizations/migrating-to-improved-organization-permissions/index.md @@ -1,12 +1,12 @@ --- title: Migrating to improved organization permissions intro: 'If your organization was created after September 2015, your organization includes improved organization permissions by default. Organizations created before September 2015 may need to migrate older Owners and Admin teams to the improved organization permissions model.' -mapTopic: true redirect_from: - /articles/improved-organization-permissions/ - /articles/github-direct-organization-membership-pre-release-guide/ - /articles/migrating-your-organization-to-improved-organization-permissions/ - /articles/migrating-to-improved-organization-permissions + - /github/setting-up-and-managing-organizations-and-teams/migrating-to-improved-organization-permissions versions: free-pro-team: '*' enterprise-server: '*' @@ -15,3 +15,6 @@ topics: - teams --- +{% link_in_list /converting-an-owners-team-to-improved-organization-permissions %} +{% link_in_list /converting-an-admin-team-to-improved-organization-permissions %} +{% link_in_list /migrating-admin-teams-to-improved-organization-permissions %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/migrating-admin-teams-to-improved-organization-permissions.md b/content/organizations/migrating-to-improved-organization-permissions/migrating-admin-teams-to-improved-organization-permissions.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/migrating-admin-teams-to-improved-organization-permissions.md rename to content/organizations/migrating-to-improved-organization-permissions/migrating-admin-teams-to-improved-organization-permissions.md index 47a3e880a4..b29dc59631 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/migrating-admin-teams-to-improved-organization-permissions.md +++ b/content/organizations/migrating-to-improved-organization-permissions/migrating-admin-teams-to-improved-organization-permissions.md @@ -4,6 +4,7 @@ intro: 'If your organization was created after September 2015, your organization redirect_from: - /articles/migrating-your-previous-admin-teams-to-the-improved-organization-permissions/ - /articles/migrating-admin-teams-to-improved-organization-permissions + - /github/setting-up-and-managing-organizations-and-teams/migrating-admin-teams-to-improved-organization-permissions versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md b/content/organizations/organizing-members-into-teams/about-teams.md similarity index 97% rename from content/github/setting-up-and-managing-organizations-and-teams/about-teams.md rename to content/organizations/organizing-members-into-teams/about-teams.md index aa9b95d1fd..cf887f548a 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/about-teams.md +++ b/content/organizations/organizing-members-into-teams/about-teams.md @@ -3,6 +3,7 @@ title: About teams intro: Teams are groups of organization members that reflect your company or group's structure with cascading access permissions and mentions. redirect_from: - /articles/about-teams + - /github/setting-up-and-managing-organizations-and-teams/about-teams versions: free-pro-team: '*' enterprise-server: '*' @@ -39,7 +40,7 @@ You can also use LDAP Sync to synchronize {% data variables.product.product_loca Each team has its own page within an organization. On a team's page, you can view team members, child teams, and the team's repositories. Organization owners and team maintainers can access team settings and update the team's description and profile picture from the team's page. -Organization members can create and participate in discussions with the team. For more information, see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)." +Organization members can create and participate in discussions with the team. For more information, see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)." ![Team page listing team members and discussions](/assets/images/help/organizations/team-page-discussions-tab.png) diff --git a/content/github/setting-up-and-managing-organizations-and-teams/adding-organization-members-to-a-team.md b/content/organizations/organizing-members-into-teams/adding-organization-members-to-a-team.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/adding-organization-members-to-a-team.md rename to content/organizations/organizing-members-into-teams/adding-organization-members-to-a-team.md index e1152db89d..71f787437d 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/adding-organization-members-to-a-team.md +++ b/content/organizations/organizing-members-into-teams/adding-organization-members-to-a-team.md @@ -4,6 +4,7 @@ intro: 'People with owner or team maintainer permissions can add organization me redirect_from: - /articles/adding-organization-members-to-a-team-early-access-program/ - /articles/adding-organization-members-to-a-team + - /github/setting-up-and-managing-organizations-and-teams/adding-organization-members-to-a-team versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/changing-team-visibility.md b/content/organizations/organizing-members-into-teams/changing-team-visibility.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/changing-team-visibility.md rename to content/organizations/organizing-members-into-teams/changing-team-visibility.md index 262113a3a3..02a93f9013 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/changing-team-visibility.md +++ b/content/organizations/organizing-members-into-teams/changing-team-visibility.md @@ -3,6 +3,7 @@ title: Changing team visibility intro: Team maintainers and organization owners can determine whether a team is *visible* or *secret*. redirect_from: - /articles/changing-team-visibility + - /github/setting-up-and-managing-organizations-and-teams/changing-team-visibility versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/creating-a-team.md b/content/organizations/organizing-members-into-teams/creating-a-team.md similarity index 89% rename from content/github/setting-up-and-managing-organizations-and-teams/creating-a-team.md rename to content/organizations/organizing-members-into-teams/creating-a-team.md index 4bba443eb8..e3884e45df 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/creating-a-team.md +++ b/content/organizations/organizing-members-into-teams/creating-a-team.md @@ -4,6 +4,7 @@ intro: You can create independent or nested teams to manage repository permissio redirect_from: - /articles/creating-a-team-early-access-program/ - /articles/creating-a-team + - /github/setting-up-and-managing-organizations-and-teams/creating-a-team versions: free-pro-team: '*' enterprise-server: '*' @@ -24,7 +25,7 @@ Only organization owners and maintainers of a parent team can create a new child {% data reusables.organizations.team_description %} {% data reusables.organizations.create-team-choose-parent %} {% if currentVersion == "free-pro-team@latest" %} -1. Optionally, if your organization or enterprise account uses team synchronization, to connect an identity provider group to your team, use the "Identity Provider Groups" drop-down menu, and select up to 5 identity provider groups. For more information, see "[Synchronizing a team with an identity provider group](/github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group)." +1. Optionally, if your organization or enterprise account uses team synchronization, to connect an identity provider group to your team, use the "Identity Provider Groups" drop-down menu, and select up to 5 identity provider groups. For more information, see "[Synchronizing a team with an identity provider group](/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group)." ![Drop-down menu to choose identity provider groups](/assets/images/help/teams/choose-an-idp-group.png) {% endif %} {% data reusables.organizations.team_visibility %} diff --git a/content/github/setting-up-and-managing-organizations-and-teams/deleting-a-team.md b/content/organizations/organizing-members-into-teams/deleting-a-team.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/deleting-a-team.md rename to content/organizations/organizing-members-into-teams/deleting-a-team.md index 5509cc6d98..505eca7bb5 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/deleting-a-team.md +++ b/content/organizations/organizing-members-into-teams/deleting-a-team.md @@ -3,6 +3,7 @@ title: Deleting a team intro: Organization owners can delete teams at any time from the team's settings page. redirect_from: - /articles/deleting-a-team + - /github/setting-up-and-managing-organizations-and-teams/deleting-a-team versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/disabling-team-discussions-for-your-organization.md b/content/organizations/organizing-members-into-teams/disabling-team-discussions-for-your-organization.md similarity index 83% rename from content/github/setting-up-and-managing-organizations-and-teams/disabling-team-discussions-for-your-organization.md rename to content/organizations/organizing-members-into-teams/disabling-team-discussions-for-your-organization.md index 99b423896d..105a28d2bb 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/disabling-team-discussions-for-your-organization.md +++ b/content/organizations/organizing-members-into-teams/disabling-team-discussions-for-your-organization.md @@ -3,6 +3,7 @@ title: Disabling team discussions for your organization intro: Organization owners can choose to disable or enable team discussions across the organization. redirect_from: - /articles/disabling-team-discussions-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/disabling-team-discussions-for-your-organization versions: free-pro-team: '*' enterprise-server: '*' @@ -12,7 +13,7 @@ topics: - teams --- -{% data reusables.organizations.team-discussions-default %} For more information on team discussions, see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)." +{% data reusables.organizations.team-discussions-default %} For more information on team discussions, see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)." {% data reusables.profile.access_profile %} {% data reusables.profile.access_org %} diff --git a/content/organizations/organizing-members-into-teams/index.md b/content/organizations/organizing-members-into-teams/index.md new file mode 100644 index 0000000000..0efd481006 --- /dev/null +++ b/content/organizations/organizing-members-into-teams/index.md @@ -0,0 +1,38 @@ +--- +title: Organizing members into teams +intro: You can group organization members into teams that reflect your company or group's structure with cascading access permissions and mentions. +redirect_from: + - /articles/setting-up-teams-improved-organization-permissions/ + - /articles/setting-up-teams-for-accessing-organization-repositories/ + - /articles/creating-teams/ + - /articles/adding-people-to-teams-in-an-organization/ + - /articles/removing-a-member-from-a-team-in-your-organization/ + - /articles/setting-up-teams/ + - /articles/maintaining-teams-improved-organization-permissions/ + - /articles/maintaining-teams/ + - /articles/organizing-members-into-teams + - /github/setting-up-and-managing-organizations-and-teams/organizing-members-into-teams +versions: + free-pro-team: '*' + enterprise-server: '*' + github-ae: '*' +topics: + - organizations + - teams +--- + +{% link_in_list /about-teams %} +{% link_in_list /creating-a-team %} +{% link_in_list /setting-your-teams-profile-picture %} +{% link_in_list /adding-organization-members-to-a-team %} +{% link_in_list /managing-code-review-assignment-for-your-team %} +{% link_in_list /renaming-a-team %} +{% link_in_list /changing-team-visibility %} +{% link_in_list /synchronizing-a-team-with-an-identity-provider-group %} +{% link_in_list /moving-a-team-in-your-organizations-hierarchy %} +{% link_in_list /requesting-to-add-a-child-team %} +{% link_in_list /requesting-to-add-or-change-a-parent-team %} +{% link_in_list /removing-organization-members-from-a-team %} +{% link_in_list /disabling-team-discussions-for-your-organization %} +{% link_in_list /managing-scheduled-reminders-for-your-team %} +{% link_in_list /deleting-a-team %} \ No newline at end of file diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md b/content/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md rename to content/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team.md index 3ba913f229..2d0a1adbf3 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team.md +++ b/content/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team.md @@ -1,6 +1,8 @@ --- title: Managing code review assignment for your team intro: Code review assignments clearly indicate which members of a team are expected to submit a review for a pull request. +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team product: '{% data reusables.gated-features.code-review-assignment %}' versions: free-pro-team: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-team.md b/content/organizations/organizing-members-into-teams/managing-scheduled-reminders-for-your-team.md similarity index 89% rename from content/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-team.md rename to content/organizations/organizing-members-into-teams/managing-scheduled-reminders-for-your-team.md index be3b2ef9c0..6ae379265f 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-team.md +++ b/content/organizations/organizing-members-into-teams/managing-scheduled-reminders-for-your-team.md @@ -3,6 +3,7 @@ title: Managing scheduled reminders for your team intro: You can get reminders in Slack when your team has pull requests waiting for review. redirect_from: - /github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-pull-requests + - /github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your team versions: free-pro-team: '*' topics: @@ -14,7 +15,7 @@ topics: {% data reusables.reminders.about-scheduled-reminders-teams-orgs %} -Team maintainers and organization owners can set scheduled reminders for any pull requests that a team has been requested to review. Before you can create a scheduled reminder for your team, an organization owner must authorize your Slack workspace. For more information, see "[Managing scheduled reminders for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-organization)." +Team maintainers and organization owners can set scheduled reminders for any pull requests that a team has been requested to review. Before you can create a scheduled reminder for your team, an organization owner must authorize your Slack workspace. For more information, see "[Managing scheduled reminders for your organization](/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization)." {% data reusables.reminders.scheduled-reminders-limitations %} @@ -64,5 +65,5 @@ Team maintainers and organization owners can set scheduled reminders for any pul ### Further reading -- "[Managing scheduled reminders for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-your-organization)" +- "[Managing scheduled reminders for your organization](/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization)" - "[Managing your scheduled reminders](/github/setting-up-and-managing-your-github-user-account/managing-your-scheduled-reminders)" diff --git a/content/github/setting-up-and-managing-organizations-and-teams/moving-a-team-in-your-organizations-hierarchy.md b/content/organizations/organizing-members-into-teams/moving-a-team-in-your-organizations-hierarchy.md similarity index 95% rename from content/github/setting-up-and-managing-organizations-and-teams/moving-a-team-in-your-organizations-hierarchy.md rename to content/organizations/organizing-members-into-teams/moving-a-team-in-your-organizations-hierarchy.md index 7ffab5946c..702d09e94e 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/moving-a-team-in-your-organizations-hierarchy.md +++ b/content/organizations/organizing-members-into-teams/moving-a-team-in-your-organizations-hierarchy.md @@ -5,6 +5,7 @@ redirect_from: - /articles/changing-a-team-s-parent/ - /articles/moving-a-team-in-your-organization-s-hierarchy - /articles/moving-a-team-in-your-organizations-hierarchy + - /github/setting-up-and-managing-organizations-and-teams/moving-a-team-in-your-organizations-hierarchy versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/removing-organization-members-from-a-team.md b/content/organizations/organizing-members-into-teams/removing-organization-members-from-a-team.md similarity index 91% rename from content/github/setting-up-and-managing-organizations-and-teams/removing-organization-members-from-a-team.md rename to content/organizations/organizing-members-into-teams/removing-organization-members-from-a-team.md index 5407d12da3..d26a3f5f88 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/removing-organization-members-from-a-team.md +++ b/content/organizations/organizing-members-into-teams/removing-organization-members-from-a-team.md @@ -4,6 +4,7 @@ intro: 'People with *owner* or *team maintainer* permissions can remove team mem redirect_from: - /articles/removing-organization-members-from-a-team-early-access-program/ - /articles/removing-organization-members-from-a-team + - /github/setting-up-and-managing-organizations-and-teams/removing-organization-members-from-a-team versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/renaming-a-team.md b/content/organizations/organizing-members-into-teams/renaming-a-team.md similarity index 89% rename from content/github/setting-up-and-managing-organizations-and-teams/renaming-a-team.md rename to content/organizations/organizing-members-into-teams/renaming-a-team.md index 333b94a9dc..3161fa210b 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/renaming-a-team.md +++ b/content/organizations/organizing-members-into-teams/renaming-a-team.md @@ -3,6 +3,7 @@ title: Renaming a team intro: Team maintainers and organization owners can edit the name and description of a team. redirect_from: - /articles/renaming-a-team + - /github/setting-up-and-managing-organizations-and-teams/renaming-a-team versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/requesting-to-add-a-child-team.md b/content/organizations/organizing-members-into-teams/requesting-to-add-a-child-team.md similarity index 96% rename from content/github/setting-up-and-managing-organizations-and-teams/requesting-to-add-a-child-team.md rename to content/organizations/organizing-members-into-teams/requesting-to-add-a-child-team.md index 26a741bfc4..ced4cbafd1 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/requesting-to-add-a-child-team.md +++ b/content/organizations/organizing-members-into-teams/requesting-to-add-a-child-team.md @@ -3,6 +3,7 @@ title: Requesting to add a child team intro: 'If you have maintainer permissions in a team, you can request to nest an existing team under your team in your organization’s hierarchy.' redirect_from: - /articles/requesting-to-add-a-child-team + - /github/setting-up-and-managing-organizations-and-teams/requesting-to-add-a-child-team versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/requesting-to-add-or-change-a-parent-team.md b/content/organizations/organizing-members-into-teams/requesting-to-add-or-change-a-parent-team.md similarity index 95% rename from content/github/setting-up-and-managing-organizations-and-teams/requesting-to-add-or-change-a-parent-team.md rename to content/organizations/organizing-members-into-teams/requesting-to-add-or-change-a-parent-team.md index df965d01f5..d22b063105 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/requesting-to-add-or-change-a-parent-team.md +++ b/content/organizations/organizing-members-into-teams/requesting-to-add-or-change-a-parent-team.md @@ -3,6 +3,7 @@ title: Requesting to add or change a parent team intro: 'If you have maintainer permissions in a team, you can request to nest your team under a parent team in your organization''s hierarchy.' redirect_from: - /articles/requesting-to-add-or-change-a-parent-team + - /github/setting-up-and-managing-organizations-and-teams/requesting-to-add-or-change-a-parent-team versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/setting-your-teams-profile-picture.md b/content/organizations/organizing-members-into-teams/setting-your-teams-profile-picture.md similarity index 91% rename from content/github/setting-up-and-managing-organizations-and-teams/setting-your-teams-profile-picture.md rename to content/organizations/organizing-members-into-teams/setting-your-teams-profile-picture.md index e22599de91..1bade56858 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/setting-your-teams-profile-picture.md +++ b/content/organizations/organizing-members-into-teams/setting-your-teams-profile-picture.md @@ -4,6 +4,7 @@ intro: 'Team maintainers and organization owners can set a profile picture for a redirect_from: - /articles/setting-your-team-s-profile-picture - /articles/setting-your-teams-profile-picture + - /github/setting-up-and-managing-organizations-and-teams/setting-your-teams-profile-picture versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group.md b/content/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group.md similarity index 89% rename from content/github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group.md rename to content/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group.md index b37dc6cb95..d43224e935 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group.md +++ b/content/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group.md @@ -1,6 +1,8 @@ --- title: Synchronizing a team with an identity provider group intro: 'You can synchronize a {% data variables.product.product_name %} team with an identity provider (IdP) group to automatically add and remove team members.' +redirect_from: + - /github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group product: '{% data reusables.gated-features.team-synchronization %}' permissions: 'Organization owners and team maintainers can synchronize a {% data variables.product.prodname_dotcom %} team with an IdP group.' versions: @@ -32,7 +34,7 @@ Connecting a team to an IdP group may remove some team members. For more informa When group membership changes on your IdP, your IdP sends a SCIM request with the changes to {% data variables.product.product_name %} according to the schedule determined by your IdP. Any requests that change {% data variables.product.prodname_dotcom %} team or organization membership will register in the audit log as changes made by the account used to configure user provisioning. For more information about this account, see "[Configuring user provisioning for your enterprise](/admin/authentication/configuring-user-provisioning-for-your-enterprise)." For more information about SCIM request schedules, see "[Check the status of user provisioning](https://docs.microsoft.com/en-us/azure/active-directory/app-provisioning/application-provisioning-when-will-provisioning-finish-specific-user)" in the Microsoft Docs. {% endif %} -Parent teams cannot synchronize with IdP groups. If the team you want to connect to an IdP group is a parent team, we recommend creating a new team or removing the nested relationships that make your team a parent team. For more information, see "[About teams](/articles/about-teams#nested-teams)," "[Creating a team](/github/setting-up-and-managing-organizations-and-teams/creating-a-team)," and "[Moving a team in your organization's hierarchy](/articles/moving-a-team-in-your-organizations-hierarchy)." +Parent teams cannot synchronize with IdP groups. If the team you want to connect to an IdP group is a parent team, we recommend creating a new team or removing the nested relationships that make your team a parent team. For more information, see "[About teams](/articles/about-teams#nested-teams)," "[Creating a team](/organizations/organizing-members-into-teams/creating-a-team)," and "[Moving a team in your organization's hierarchy](/articles/moving-a-team-in-your-organizations-hierarchy)." To manage repository access for any {% data variables.product.prodname_dotcom %} team, including teams connected to an IdP group, you must make changes with {% data variables.product.product_name %}. For more information, see "[About teams](/articles/about-teams)" and "[Managing team access to an organization repository](/articles/managing-team-access-to-an-organization-repository)." @@ -46,7 +48,7 @@ After you connect a team to an IdP group, team synchronization will add each mem - The person has already logged in with their user account on {% data variables.product.product_name %} and authenticated to the organization or enterprise account via SAML single sign-on at least once. - The person's SSO identity is a member of the IdP group. -Existing teams or group members who do not meet these criteria will be automatically removed from the team on {% data variables.product.product_name %} and lose access to repositories. Revoking a user's linked identity will also remove the user from from any teams mapped to IdP groups. For more information, see "[Viewing and managing a member's SAML access to your organization](/github/setting-up-and-managing-organizations-and-teams/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)" and "[Viewing and managing a user's SAML access to your enterprise](/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise#viewing-and-revoking-a-linked-identity)." +Existing teams or group members who do not meet these criteria will be automatically removed from the team on {% data variables.product.product_name %} and lose access to repositories. Revoking a user's linked identity will also remove the user from from any teams mapped to IdP groups. For more information, see "[Viewing and managing a member's SAML access to your organization](/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization#viewing-and-revoking-a-linked-identity)" and "[Viewing and managing a user's SAML access to your enterprise](/github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise#viewing-and-revoking-a-linked-identity)." A removed team member can be added back to a team automatically once they have authenticated to the organization or enterprise account using SSO and are moved to the connected IdP group. @@ -59,7 +61,7 @@ If your organization is owned by an enterprise account, enabling team synchroniz ### Prerequisites {% if currentVersion == "free-pro-team@latest" %} -Before you can connect a {% data variables.product.product_name %} team with an identity provider group, an organization or enterprise owner must enable team synchronization for your organization or enterprise account. For more information, see "[Managing team synchronization for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-team-synchronization-for-your-organization)" and "[Managing team synchronization for organizations in your enterprise account](/github/setting-up-and-managing-your-enterprise/managing-team-synchronization-for-organizations-in-your-enterprise-account)." +Before you can connect a {% data variables.product.product_name %} team with an identity provider group, an organization or enterprise owner must enable team synchronization for your organization or enterprise account. For more information, see "[Managing team synchronization for your organization](/organizations/managing-saml-single-sign-on-for-your-organization/managing-team-synchronization-for-your-organization)" and "[Managing team synchronization for organizations in your enterprise account](/github/setting-up-and-managing-your-enterprise/managing-team-synchronization-for-organizations-in-your-enterprise-account)." To avoid unintentionally removing team members, visit the administrative portal for your IdP and confirm that each current team member is also in the IdP groups that you want to connect to this team. If you don't have this access to your identity provider, you can reach out to your IdP administrator. diff --git a/content/github/setting-up-and-managing-organizations-and-teams/about-oauth-app-access-restrictions.md b/content/organizations/restricting-access-to-your-organizations-data/about-oauth-app-access-restrictions.md similarity index 98% rename from content/github/setting-up-and-managing-organizations-and-teams/about-oauth-app-access-restrictions.md rename to content/organizations/restricting-access-to-your-organizations-data/about-oauth-app-access-restrictions.md index 4122072bda..1be3424488 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/about-oauth-app-access-restrictions.md +++ b/content/organizations/restricting-access-to-your-organizations-data/about-oauth-app-access-restrictions.md @@ -4,6 +4,7 @@ intro: 'Organizations can choose which {% data variables.product.prodname_oauth_ redirect_from: - /articles/about-third-party-application-restrictions/ - /articles/about-oauth-app-access-restrictions + - /github/setting-up-and-managing-organizations-and-teams/about-oauth-app-access-restrictions versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/approving-oauth-apps-for-your-organization.md b/content/organizations/restricting-access-to-your-organizations-data/approving-oauth-apps-for-your-organization.md similarity index 93% rename from content/github/setting-up-and-managing-organizations-and-teams/approving-oauth-apps-for-your-organization.md rename to content/organizations/restricting-access-to-your-organizations-data/approving-oauth-apps-for-your-organization.md index f228264ab7..dba9c81362 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/approving-oauth-apps-for-your-organization.md +++ b/content/organizations/restricting-access-to-your-organizations-data/approving-oauth-apps-for-your-organization.md @@ -4,6 +4,7 @@ intro: 'When an organization member requests {% data variables.product.prodname_ redirect_from: - /articles/approving-third-party-applications-for-your-organization/ - /articles/approving-oauth-apps-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/approving-oauth-apps-for-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/denying-access-to-a-previously-approved-oauth-app-for-your-organization.md b/content/organizations/restricting-access-to-your-organizations-data/denying-access-to-a-previously-approved-oauth-app-for-your-organization.md similarity index 88% rename from content/github/setting-up-and-managing-organizations-and-teams/denying-access-to-a-previously-approved-oauth-app-for-your-organization.md rename to content/organizations/restricting-access-to-your-organizations-data/denying-access-to-a-previously-approved-oauth-app-for-your-organization.md index f83e8694c7..fb80c402af 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/denying-access-to-a-previously-approved-oauth-app-for-your-organization.md +++ b/content/organizations/restricting-access-to-your-organizations-data/denying-access-to-a-previously-approved-oauth-app-for-your-organization.md @@ -4,6 +4,7 @@ intro: 'If an organization no longer requires a previously authorized {% data va redirect_from: - /articles/denying-access-to-a-previously-approved-application-for-your-organization/ - /articles/denying-access-to-a-previously-approved-oauth-app-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/denying-access-to-a-previously-approved-oauth-app-for-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/disabling-oauth-app-access-restrictions-for-your-organization.md b/content/organizations/restricting-access-to-your-organizations-data/disabling-oauth-app-access-restrictions-for-your-organization.md similarity index 92% rename from content/github/setting-up-and-managing-organizations-and-teams/disabling-oauth-app-access-restrictions-for-your-organization.md rename to content/organizations/restricting-access-to-your-organizations-data/disabling-oauth-app-access-restrictions-for-your-organization.md index 0cd8846027..7423d3ee76 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/disabling-oauth-app-access-restrictions-for-your-organization.md +++ b/content/organizations/restricting-access-to-your-organizations-data/disabling-oauth-app-access-restrictions-for-your-organization.md @@ -4,6 +4,7 @@ intro: 'Organization owners can disable restrictions on the {% data variables.pr redirect_from: - /articles/disabling-third-party-application-restrictions-for-your-organization/ - /articles/disabling-oauth-app-access-restrictions-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/disabling-oauth-app-access-restrictions-for-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/enabling-oauth-app-access-restrictions-for-your-organization.md b/content/organizations/restricting-access-to-your-organizations-data/enabling-oauth-app-access-restrictions-for-your-organization.md similarity index 95% rename from content/github/setting-up-and-managing-organizations-and-teams/enabling-oauth-app-access-restrictions-for-your-organization.md rename to content/organizations/restricting-access-to-your-organizations-data/enabling-oauth-app-access-restrictions-for-your-organization.md index adc8f17827..67c0d8748a 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/enabling-oauth-app-access-restrictions-for-your-organization.md +++ b/content/organizations/restricting-access-to-your-organizations-data/enabling-oauth-app-access-restrictions-for-your-organization.md @@ -4,6 +4,7 @@ intro: 'Organization owners can enable {% data variables.product.prodname_oauth_ redirect_from: - /articles/enabling-third-party-application-restrictions-for-your-organization/ - /articles/enabling-oauth-app-access-restrictions-for-your-organization + - /github/setting-up-and-managing-organizations-and-teams/enabling-oauth-app-access-restrictions-for-your-organization versions: free-pro-team: '*' topics: diff --git a/content/github/setting-up-and-managing-organizations-and-teams/restricting-access-to-your-organizations-data.md b/content/organizations/restricting-access-to-your-organizations-data/index.md similarity index 55% rename from content/github/setting-up-and-managing-organizations-and-teams/restricting-access-to-your-organizations-data.md rename to content/organizations/restricting-access-to-your-organizations-data/index.md index e85083f736..9cf976f93a 100644 --- a/content/github/setting-up-and-managing-organizations-and-teams/restricting-access-to-your-organizations-data.md +++ b/content/organizations/restricting-access-to-your-organizations-data/index.md @@ -4,7 +4,7 @@ intro: '{% data variables.product.prodname_oauth_app %} access restrictions allo redirect_from: - /articles/restricting-access-to-your-organization-s-data - /articles/restricting-access-to-your-organizations-data -mapTopic: true + - /github/setting-up-and-managing-organizations-and-teams/restricting-access-to-your-organizations-data versions: free-pro-team: '*' topics: @@ -12,3 +12,8 @@ topics: - teams --- +{% link_in_list /about-oauth-app-access-restrictions %} +{% link_in_list /enabling-oauth-app-access-restrictions-for-your-organization %} +{% link_in_list /disabling-oauth-app-access-restrictions-for-your-organization %} +{% link_in_list /approving-oauth-apps-for-your-organization %} +{% link_in_list /denying-access-to-a-previously-approved-oauth-app-for-your-organization %} \ No newline at end of file diff --git a/content/packages/index.md b/content/packages/index.md index 14afebfca8..56deb1e548 100644 --- a/content/packages/index.md +++ b/content/packages/index.md @@ -20,15 +20,8 @@ featuredLinks: - /packages/guides/enabling-improved-container-support - /packages/guides/configuring-rubygems-for-use-with-github-packages changelog: - - title: ghcr.io maintenance mode on 2021-01-09 - date: '2021-01-08' - href: https://github.blog/changelog/2021-01-08-packages-ghcr-io-maintenance-mode-on-2021-01-09/ - - title: ghcr.io container names redirect to the container page - date: '2020-12-14' - href: https://github.blog/changelog/2020-12-14-ghcr-io-container-names-redirect-to-the-container-page/ - - title: Filter for tagged and untagged containers - date: '2020-12-14' - href: https://github.blog/changelog/2020-12-14-packages-can-filter-for-tagged-and-untagged-containers/ + label: 'packages' + prefix: 'Packages: ' redirect_from: - /github/managing-packages-with-github-packages - /categories/managing-packages-with-github-package-registry diff --git a/content/github/working-with-github-pages/about-custom-domains-and-github-pages.md b/content/pages/configuring-a-custom-domain-for-your-github-pages-site/about-custom-domains-and-github-pages.md similarity index 81% rename from content/github/working-with-github-pages/about-custom-domains-and-github-pages.md rename to content/pages/configuring-a-custom-domain-for-your-github-pages-site/about-custom-domains-and-github-pages.md index aaf7ed7f34..d2fb0c014b 100644 --- a/content/github/working-with-github-pages/about-custom-domains-and-github-pages.md +++ b/content/pages/configuring-a-custom-domain-for-your-github-pages-site/about-custom-domains-and-github-pages.md @@ -6,6 +6,7 @@ redirect_from: - /articles/about-supported-custom-domains/ - /articles/custom-domain-redirects-for-your-github-pages-site/ - /articles/about-custom-domains-and-github-pages + - /github/working-with-github-pages/about-custom-domains-and-github-pages product: '{% data reusables.gated-features.pages %}' versions: free-pro-team: '*' @@ -23,7 +24,9 @@ topics: | Custom subdomain | `blog.example.com` | | Apex domain | `example.com` | -You can set up either or both types of custom domains for your site. We recommend always using a `www` subdomain, even if you also use an apex domain. For more information, see "[Using an apex domain for your {% data variables.product.prodname_pages %} site](#using-an-apex-domain-for-your-github-pages-site)." +You can set up either or both of apex and `www` subdomain configurations for your site. For more information on apex domains, see "[Using an apex domain for your {% data variables.product.prodname_pages %} site](#using-an-apex-domain-for-your-github-pages-site)." + +We recommend always using a `www` subdomain, even if you also use an apex domain. When you create a new site with an apex domain, we automatically attempt to secure the `www` subdomain for use when serving your site's content. If you configure a `www` subdomain, we automatically attempt to secure the associated apex domain. For more information, see "[Managing a custom domain for your {% data variables.product.prodname_pages %} site](/articles/managing-a-custom-domain-for-your-github-pages-site)." After you configure a custom domain for a user or organization site, the custom domain will replace the `.github.io` or `.github.io` portion of the URL for any project sites owned by the account that do not have a custom domain configured. For example, if the custom domain for your user site is `www.octocat.com`, and you have a project site with no custom domain configured that is published from a repository called `octo-project`, the {% data variables.product.prodname_pages %} site for that repository will be available at `www.octocat.com/octo-project`. @@ -37,11 +40,11 @@ Subdomains are configured with a `CNAME` record through your DNS provider. For m A `www` subdomain is the most commonly used type of subdomain. For example, `www.example.com` includes a `www` subdomain. -`www` subdomains are the most stable type of custom domain because `www` subdomains are not affected by changes to the IP addresses of {% data variables.product.product_name %}'s servers. Your site will also load faster because Denial of Service (DoS) attack protection can be implemented more efficiently. +`www` subdomains are the most stable type of custom domain because `www` subdomains are not affected by changes to the IP addresses of {% data variables.product.product_name %}'s servers. #### Custom subdomains -A custom subdomain is a type of subdomain that doesn't use the standard `www` subdomain. Custom subdomains are mostly used when you want two distinct sections of your site. For example, you can create a site called `blog.example.com` and customize that section independently from `www.example.com`. +A custom subdomain is a type of subdomain that doesn't use the standard `www` variant. Custom subdomains are mostly used when you want two distinct sections of your site. For example, you can create a site called `blog.example.com` and customize that section independently from `www.example.com`. ### Using an apex domain for your {% data variables.product.prodname_pages %} site diff --git a/content/github/working-with-github-pages/configuring-a-custom-domain-for-your-github-pages-site.md b/content/pages/configuring-a-custom-domain-for-your-github-pages-site/index.md similarity index 73% rename from content/github/working-with-github-pages/configuring-a-custom-domain-for-your-github-pages-site.md rename to content/pages/configuring-a-custom-domain-for-your-github-pages-site/index.md index 59a714c5d8..9e748a4882 100644 --- a/content/github/working-with-github-pages/configuring-a-custom-domain-for-your-github-pages-site.md +++ b/content/pages/configuring-a-custom-domain-for-your-github-pages-site/index.md @@ -10,11 +10,14 @@ redirect_from: - /articles/setting-up-a-custom-domain-with-pages/ - /articles/setting-up-a-custom-domain-with-github-pages/ - /articles/configuring-a-custom-domain-for-your-github-pages-site + - /github/working-with-github-pages/configuring-a-custom-domain-for-your-github-pages-site product: '{% data reusables.gated-features.pages %}' -mapTopic: true versions: free-pro-team: '*' topics: - pages --- +{% link_in_list /about-custom-domains-and-github-pages %} +{% link_in_list /managing-a-custom-domain-for-your-github-pages-site %} +{% link_in_list /troubleshooting-custom-domains-and-github-pages %} \ No newline at end of file diff --git a/content/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site.md b/content/pages/configuring-a-custom-domain-for-your-github-pages-site/managing-a-custom-domain-for-your-github-pages-site.md similarity index 75% rename from content/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site.md rename to content/pages/configuring-a-custom-domain-for-your-github-pages-site/managing-a-custom-domain-for-your-github-pages-site.md index d42cf0a802..e2410b488a 100644 --- a/content/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site.md +++ b/content/pages/configuring-a-custom-domain-for-your-github-pages-site/managing-a-custom-domain-for-your-github-pages-site.md @@ -10,6 +10,7 @@ redirect_from: - /articles/adding-a-cname-file-to-your-repository/ - /articles/setting-up-your-pages-site-repository/ - /articles/managing-a-custom-domain-for-your-github-pages-site + - /github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site product: '{% data reusables.gated-features.pages %}' versions: free-pro-team: '*' @@ -41,6 +42,7 @@ To set up a `www` or custom subdomain, such as `www.example.com` or `blog.exampl {% data reusables.pages.navigate-site-repo %} {% data reusables.repositories.sidebar-settings %} +{% data reusables.pages.sidebar-pages %} 4. Under "Custom domain", type your custom domain, then click **Save**. This will create a commit that adds a _CNAME_ file in the root of your publishing source. ![Save custom domain button](/assets/images/help/pages/save-custom-subdomain.png) 5. Navigate to your DNS provider and create a `CNAME` record that points your subdomain to the default domain for your site. For example, if you want to use the subdomain `www.example.com` for your user site, create a `CNAME` record that points `www.example.com` to `.github.io`. If you want to use the subdomain `www.anotherexample.com` for your organization site, create a `CNAME` record that points `www.anotherexample.com` to `.github.io`. The `CNAME` record should always point to `.github.io` or `.github.io`, excluding the repository name. {% data reusables.pages.contact-dns-provider %} {% data reusables.pages.default-domain-information %} @@ -66,6 +68,7 @@ To set up an apex domain, such as `example.com`, you must configure a _CNAME_ fi {% data reusables.pages.navigate-site-repo %} {% data reusables.repositories.sidebar-settings %} +{% data reusables.pages.sidebar-pages %} 4. Under "Custom domain", type your custom domain, then click **Save**. This will create a commit that adds a _CNAME_ file in the root of your publishing source. ![Save custom domain button](/assets/images/help/pages/save-custom-apex-domain.png) 5. Navigate to your DNS provider and create either an `ALIAS`, `ANAME`, or `A` record. {% data reusables.pages.contact-dns-provider %} @@ -91,6 +94,31 @@ To set up an apex domain, such as `example.com`, you must configure a _CNAME_ fi {% data reusables.pages.build-locally-download-cname %} {% data reusables.pages.enforce-https-custom-domain %} +### Configuring an apex domain and the `www` subdomain variant + +When using an apex domain, we recommend configuring your {% data variables.product.prodname_pages %} site to host content at both the apex domain and that domain's `www` subdomain variant. + +To set up a `www` subdomain alongside the apex domain, you must first configure an apex domain, which will create an `ALIAS`, `ANAME`, or `A` record with your DNS provider. For more information, see "[Configuring an apex domain](#configuring-an-apex-domain)." + +After you configure the apex domain, you must to configure a CNAME record with your DNS provider. + +1. Navigate to your DNS provider and create a `CNAME` record that points `www.example.com` to the default domain for your site: `.github.io` or `.github.io`. Do not include the repository name. {% data reusables.pages.contact-dns-provider %} {% data reusables.pages.default-domain-information %} +2. To confirm that your DNS record configured correctly, use the `dig` command, replacing _WWW.EXAMPLE.COM_ with your `www` subdomain variant. +```shell + $ dig WWW.EXAMPLE.COM +nostats +nocomments +nocmd + > ;WWW.EXAMPLE.COM. IN A + > WWW.EXAMPLE.COM. 3592 IN CNAME YOUR-USERNAME.github.io. + > YOUR-USERNAME.github.io. 43192 IN CNAME GITHUB-PAGES-SERVER . + > GITHUB-PAGES-SERVER . 22 IN A 192.0.2.1 +``` +### Removing a custom domain + +{% data reusables.pages.navigate-site-repo %} +{% data reusables.repositories.sidebar-settings %} +{% data reusables.pages.sidebar-pages %} +4. Under "Custom domain," click **Remove**. + ![Save custom domain button](/assets/images/help/pages/remove-custom-domain.png) + ### Further reading - "[Troubleshooting custom domains and {% data variables.product.prodname_pages %}](/articles/troubleshooting-custom-domains-and-github-pages)" diff --git a/content/github/working-with-github-pages/troubleshooting-custom-domains-and-github-pages.md b/content/pages/configuring-a-custom-domain-for-your-github-pages-site/troubleshooting-custom-domains-and-github-pages.md similarity index 98% rename from content/github/working-with-github-pages/troubleshooting-custom-domains-and-github-pages.md rename to content/pages/configuring-a-custom-domain-for-your-github-pages-site/troubleshooting-custom-domains-and-github-pages.md index ac05a1cb90..3b7ee96541 100644 --- a/content/github/working-with-github-pages/troubleshooting-custom-domains-and-github-pages.md +++ b/content/pages/configuring-a-custom-domain-for-your-github-pages-site/troubleshooting-custom-domains-and-github-pages.md @@ -6,6 +6,7 @@ redirect_from: - /articles/custom-domain-isn-t-working/ - /articles/troubleshooting-custom-domains/ - /articles/troubleshooting-custom-domains-and-github-pages + - /github/working-with-github-pages/troubleshooting-custom-domains-and-github-pages product: '{% data reusables.gated-features.pages %}' versions: free-pro-team: '*' diff --git a/content/github/working-with-github-pages/about-github-pages.md b/content/pages/getting-started-with-github-pages/about-github-pages.md similarity index 96% rename from content/github/working-with-github-pages/about-github-pages.md rename to content/pages/getting-started-with-github-pages/about-github-pages.md index fc1ad704c5..205583ffa1 100644 --- a/content/github/working-with-github-pages/about-github-pages.md +++ b/content/pages/getting-started-with-github-pages/about-github-pages.md @@ -9,6 +9,7 @@ redirect_from: - /articles/mime-types-on-github-pages/ - /articles/should-i-rename-usernamegithubcom-repositories-to-usernamegithubio/ - /articles/about-github-pages + - /github/working-with-github-pages/about-github-pages product: '{% data reusables.gated-features.pages %}' versions: free-pro-team: '*' @@ -27,13 +28,13 @@ You can host your site on {% data variables.product.prodname_dotcom %}'s `github {% endif %} {% if currentVersion == "free-pro-team@latest" %} -{% data reusables.pages.about-private-publishing %} For more information, see "[Changing the visibility of your {% data variables.product.prodname_pages %} site](/github/working-with-github-pages/changing-the-visibility-of-your-github-pages-site)." +{% data reusables.pages.about-private-publishing %} For more information, see "[Changing the visibility of your {% data variables.product.prodname_pages %} site](/pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site)." {% endif %} To get started, see "[Creating a {% data variables.product.prodname_pages %} site](/articles/creating-a-github-pages-site)." {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %} -Organization owners can disable the publication of {% data variables.product.prodname_pages %} sites from the organization's repositories. For more information, see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization)." +Organization owners can disable the publication of {% data variables.product.prodname_pages %} sites from the organization's repositories. For more information, see "[Managing the publication of {% data variables.product.prodname_pages %} sites for your organization](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)." {% endif %} ### Types of {% data variables.product.prodname_pages %} sites @@ -45,7 +46,7 @@ To publish a user site, you must create a repository owned by your user account The source files for a project site are stored in the same repository as their project. {% if currentVersion == "free-pro-team@latest" %}Unless you're using a custom domain, project sites are available at `http(s)://.github.io/` or `http(s)://.github.io/`.{% elsif currentVersion == "github-ae@latest" %}Project sites are available at `http(s)://pages.///` or `http(s)://pages.///`.{% endif %} {% if currentVersion == "free-pro-team@latest" %} -If you publish your site privately, the URL for your site will be different. For more information, see "[Changing the visibility of your {% data variables.product.prodname_pages %} site](/github/working-with-github-pages/changing-the-visibility-of-your-github-pages-site)." +If you publish your site privately, the URL for your site will be different. For more information, see "[Changing the visibility of your {% data variables.product.prodname_pages %} site](/pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site)." {% endif %} {% if currentVersion == "free-pro-team@latest" %} diff --git a/content/github/working-with-github-pages/adding-a-theme-to-your-github-pages-site-with-the-theme-chooser.md b/content/pages/getting-started-with-github-pages/adding-a-theme-to-your-github-pages-site-with-the-theme-chooser.md similarity index 96% rename from content/github/working-with-github-pages/adding-a-theme-to-your-github-pages-site-with-the-theme-chooser.md rename to content/pages/getting-started-with-github-pages/adding-a-theme-to-your-github-pages-site-with-the-theme-chooser.md index c7ffa5b088..a80468d753 100644 --- a/content/github/working-with-github-pages/adding-a-theme-to-your-github-pages-site-with-the-theme-chooser.md +++ b/content/pages/getting-started-with-github-pages/adding-a-theme-to-your-github-pages-site-with-the-theme-chooser.md @@ -5,6 +5,7 @@ redirect_from: - /articles/creating-a-github-pages-site-with-the-jekyll-theme-chooser/ - /articles/adding-a-jekyll-theme-to-your-github-pages-site-with-the-jekyll-theme-chooser/ - /articles/adding-a-theme-to-your-github-pages-site-with-the-theme-chooser + - /github/working-with-github-pages/adding-a-theme-to-your-github-pages-site-with-the-theme-chooser product: '{% data reusables.gated-features.pages %}' versions: free-pro-team: '*' @@ -31,6 +32,7 @@ If you manually added a Jekyll theme to your repository in the past, those files {% data reusables.pages.navigate-site-repo %} {% data reusables.repositories.sidebar-settings %} +{% data reusables.pages.sidebar-pages %} 3. Under "{% data variables.product.prodname_pages %}," click **Choose a theme** or **Change theme**. ![Choose a theme button](/assets/images/help/pages/choose-a-theme.png) 4. On the top of the page, click the theme you want, then click **Select theme**. diff --git a/content/github/working-with-github-pages/changing-the-visibility-of-your-github-pages-site.md b/content/pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site.md similarity index 85% rename from content/github/working-with-github-pages/changing-the-visibility-of-your-github-pages-site.md rename to content/pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site.md index bf7722bc93..c7197c7934 100644 --- a/content/github/working-with-github-pages/changing-the-visibility-of-your-github-pages-site.md +++ b/content/pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site.md @@ -5,25 +5,28 @@ product: '{% data reusables.gated-features.private-pages %}' versions: free-pro-team: '*' permissions: People with admin permissions for a repository can change the visibility of a {% data variables.product.prodname_pages %} site. +redirect_from: + - /github/working-with-github-pages/changing-the-visibility-of-your-github-pages-site --- ### About access control for {% data variables.product.prodname_pages %} sites -If your project site is published from a private or internal repository that's owned by an organization using {% data variables.product.prodname_ghe_cloud %}, you can manage access control for the site. With access control, you can choose to publish the site publicly to anyone on the internet or privately to people with read access to your repository. A privately published site can be used to share your internal documentation or knowledge base with members of your enterprise. You cannot manage access control for an organization site. For more information about the types of {% data variables.product.prodname_pages %} sites, see "[About GitHub Pages](/github/working-with-github-pages/about-github-pages#types-of-github-pages-sites)." +If your project site is published from a private or internal repository that's owned by an organization using {% data variables.product.prodname_ghe_cloud %}, you can manage access control for the site. With access control, you can choose to publish the site publicly to anyone on the internet or privately to people with read access to your repository. A privately published site can be used to share your internal documentation or knowledge base with members of your enterprise. You cannot manage access control for an organization site. For more information about the types of {% data variables.product.prodname_pages %} sites, see "[About {% data variables.product.prodname_pages %}](/pages/getting-started-with-github-pages/about-github-pages#types-of-github-pages-sites)." Privately published sites are available at a different subdomain than publicly published sites. This ensures that your {% data variables.product.prodname_pages %} site is secure from the moment it's published: - We automatically secure every subdomain of `*.pages.github.io` with a TLS certificate, and enforce HSTS to ensure that browsers always serve the page over HTTPS. - We use a unique subdomain for the private page to ensure that other repositories in your organization cannot publish content on the same origin as the private page. This protects your private page from "[cookie tossing](https://github.blog/2013-04-09-yummy-cookies-across-domains/)". This is also why we don't host {% data variables.product.prodname_pages %} sites on the `github.com` domain. -You can see your site's unique subdomain in the pages tab of your repository settings. If you're using a static site generator configured to build the site with the repository name as a path, you may need to update the settings for the static site generator when changing the site to private. For more information, see "[Configuring Jekyll in your {% data variables.product.prodname_pages %} site](/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site#configuring-a-subdomain)" or the documentation for your static site generator. +You can see your site's unique subdomain in the pages tab of your repository settings. If you're using a static site generator configured to build the site with the repository name as a path, you may need to update the settings for the static site generator when changing the site to private. For more information, see "[Configuring Jekyll in your {% data variables.product.prodname_pages %} site](/pages/configuring-a-custom-domain-for-your-github-pages-site/managing-a-custom-domain-for-your-github-pages-site#configuring-a-subdomain)" or the documentation for your static site generator. -To use a shorter and more memorable domain for your private {% data variables.product.prodname_pages %} site, you can configure a custom domain. For more information, see "[Configuring a custom domain for your {% data variables.product.prodname_pages %} site](/github/working-with-github-pages/configuring-a-custom-domain-for-your-github-pages-site)." +To use a shorter and more memorable domain for your private {% data variables.product.prodname_pages %} site, you can configure a custom domain. For more information, see "[Configuring a custom domain for your {% data variables.product.prodname_pages %} site](/pages/configuring-a-custom-domain-for-your-github-pages-site)." ### Changing the visibility of your {% data variables.product.prodname_pages %} site {% data reusables.pages.navigate-site-repo %} {% data reusables.repositories.sidebar-settings %} +{% data reusables.pages.sidebar-pages %} 3. Under "{% data variables.product.prodname_pages %}", select the **{% data variables.product.prodname_pages %} visibility** drop-down menu, then click a visibility. ![Drop-down to choose a visibility for your site](/assets/images/help/pages/public-or-private-visibility.png) 4. To see your published site, under "{% data variables.product.prodname_pages %}", click your site's URL. diff --git a/content/github/working-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site.md b/content/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site.md similarity index 79% rename from content/github/working-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site.md rename to content/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site.md index 34fa16eaba..290fb96e49 100644 --- a/content/github/working-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site.md +++ b/content/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site.md @@ -1,9 +1,10 @@ --- title: Configuring a publishing source for your GitHub Pages site -intro: 'If you use the default publishing source for your {% data variables.product.prodname_pages %} site, your site will publish automatically. You can also choose to publish your{% if currentVersion ver_lt "enterprise-server@2.23" %} project{% endif %} site from a different branch or folder.' +intro: 'If you use the default publishing source for your {% data variables.product.prodname_pages %} site, your site will publish automatically. You can also choose to publish your{% if currentVersion ver_lt "enterprise-server@3.0" %} project{% endif %} site from a different branch or folder.' redirect_from: - /articles/configuring-a-publishing-source-for-github-pages/ - /articles/configuring-a-publishing-source-for-your-github-pages-site + - /github/working-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site product: '{% data reusables.gated-features.pages %}' permissions: 'People with admin or maintainer permissions for a repository can configure a publishing source for a {% data variables.product.prodname_pages %} site.' versions: @@ -18,18 +19,18 @@ For more information about publishing sources, see "[About {% data variables.pro ### Choosing a publishing source -Before you configure a publishing source, make sure the branch{% if currentVersion ver_lt "enterprise-server@2.23" %} or folder{% endif %} you want to use as your publishing source already exists in your repository.{% if currentVersion ver_lt "enterprise-server@2.23" %} For example, before you can publish your project site from the `/docs` folder on the `master` branch of your repository, you or a collaborator must create a `/docs` folder on the default `master` branch of your repository.{% endif %} +Before you configure a publishing source, make sure the branch{% if currentVersion ver_lt "enterprise-server@3.0" %} or folder{% endif %} you want to use as your publishing source already exists in your repository.{% if currentVersion ver_lt "enterprise-server@3.0" %} For example, before you can publish your project site from the `/docs` folder on the `master` branch of your repository, you or a collaborator must create a `/docs` folder on the default `master` branch of your repository.{% endif %} {% data reusables.pages.navigate-site-repo %} {% data reusables.repositories.sidebar-settings %} +{% data reusables.pages.sidebar-pages %} {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %} 3. Under "{% data variables.product.prodname_pages %}", use the **None** or **Branch** drop-down menu and select a publishing source. ![Drop-down menu to select a publishing source](/assets/images/help/pages/publishing-source-drop-down.png) 4. Optionally, use the drop-down menu to select a folder for your publishing source. ![Drop-down menu to select a folder for publishing source](/assets/images/help/pages/publishing-source-folder-drop-down.png) 5. Click **Save**. - ![Button to save changes to publishing source settings](/assets/images/help/pages/publishing-source-save.png) - {% else %} + ![Button to save changes to publishing source settings](/assets/images/help/pages/publishing-source-save.png){% else %} 3. Under "{% data variables.product.prodname_pages %}", use the **Source** drop-down menu and select a publishing source. ![Drop down menu to select a publishing source](/assets/images/help/pages/publishing-source-drop-down.png) {% endif %} diff --git a/content/github/working-with-github-pages/creating-a-custom-404-page-for-your-github-pages-site.md b/content/pages/getting-started-with-github-pages/creating-a-custom-404-page-for-your-github-pages-site.md similarity index 93% rename from content/github/working-with-github-pages/creating-a-custom-404-page-for-your-github-pages-site.md rename to content/pages/getting-started-with-github-pages/creating-a-custom-404-page-for-your-github-pages-site.md index b4d87e69b1..313f6793f7 100644 --- a/content/github/working-with-github-pages/creating-a-custom-404-page-for-your-github-pages-site.md +++ b/content/pages/getting-started-with-github-pages/creating-a-custom-404-page-for-your-github-pages-site.md @@ -4,6 +4,7 @@ intro: You can display a custom 404 error page when people try to access nonexis redirect_from: - /articles/custom-404-pages/ - /articles/creating-a-custom-404-page-for-your-github-pages-site + - /github/working-with-github-pages/creating-a-custom-404-page-for-your-github-pages-site product: '{% data reusables.gated-features.pages %}' versions: free-pro-team: '*' diff --git a/content/github/working-with-github-pages/creating-a-github-pages-site.md b/content/pages/getting-started-with-github-pages/creating-a-github-pages-site.md similarity index 94% rename from content/github/working-with-github-pages/creating-a-github-pages-site.md rename to content/pages/getting-started-with-github-pages/creating-a-github-pages-site.md index 07106d9952..210304bba0 100644 --- a/content/github/working-with-github-pages/creating-a-github-pages-site.md +++ b/content/pages/getting-started-with-github-pages/creating-a-github-pages-site.md @@ -7,6 +7,7 @@ redirect_from: - /articles/creating-project-pages-from-the-command-line/ - /articles/creating-project-pages-using-the-command-line/ - /articles/creating-a-github-pages-site + - /github/working-with-github-pages/creating-a-github-pages-site product: '{% data reusables.gated-features.pages %}' versions: free-pro-team: '*' @@ -40,7 +41,8 @@ topics: 3. If your chosen publishing source already exists, navigate to the publishing source. If your chosen publishing source doesn't exist, create the publishing source. 4. In the root of the publishing source, create a new file called `index.md` that contains the content you want to display on the main page of your site. {% data reusables.pages.configure-publishing-source %} -{% data reusables.repositories.sidebar-settings %}{% if currentVersion == "free-pro-team@latest" %} +{% data reusables.repositories.sidebar-settings %} +{% data reusables.pages.sidebar-pages %}{% if currentVersion == "free-pro-team@latest" %} {% data reusables.pages.choose-visibility %}{% endif %} {% data reusables.pages.visit-site %} diff --git a/content/pages/getting-started-with-github-pages/index.md b/content/pages/getting-started-with-github-pages/index.md new file mode 100644 index 0000000000..6dcbaf8ab7 --- /dev/null +++ b/content/pages/getting-started-with-github-pages/index.md @@ -0,0 +1,26 @@ +--- +title: Getting started with GitHub Pages +intro: 'You can set up a basic {% data variables.product.prodname_pages %} site for yourself, your organization, or your project.' +redirect_from: + - /categories/github-pages-basics + - /articles/additional-customizations-for-github-pages/ + - /articles/getting-started-with-github-pages + - /github/working-with-github-pages/getting-started-with-github-pages +product: '{% data reusables.gated-features.pages %}' +versions: + free-pro-team: '*' + enterprise-server: '*' + github-ae: '*' +topics: + - pages +--- + +{% link_in_list /about-github-pages %} +{% link_in_list /creating-a-github-pages-site %} +{% link_in_list /adding-a-theme-to-your-github-pages-site-with-the-theme-chooser %} +{% link_in_list /configuring-a-publishing-source-for-your-github-pages-site %} +{% link_in_list /changing-the-visibility-of-your-github-pages-site %} +{% link_in_list /creating-a-custom-404-page-for-your-github-pages-site %} +{% link_in_list /securing-your-github-pages-site-with-https %} +{% link_in_list /using-submodules-with-github-pages %} +{% link_in_list /unpublishing-a-github-pages-site %} \ No newline at end of file diff --git a/content/github/working-with-github-pages/securing-your-github-pages-site-with-https.md b/content/pages/getting-started-with-github-pages/securing-your-github-pages-site-with-https.md similarity index 93% rename from content/github/working-with-github-pages/securing-your-github-pages-site-with-https.md rename to content/pages/getting-started-with-github-pages/securing-your-github-pages-site-with-https.md index 8fde3a5ee5..fb2b49901e 100644 --- a/content/github/working-with-github-pages/securing-your-github-pages-site-with-https.md +++ b/content/pages/getting-started-with-github-pages/securing-your-github-pages-site-with-https.md @@ -4,6 +4,7 @@ intro: 'HTTPS adds a layer of encryption that prevents others from snooping on o product: '{% data reusables.gated-features.pages %}' redirect_from: - /articles/securing-your-github-pages-site-with-https + - /github/working-with-github-pages/securing-your-github-pages-site-with-https versions: free-pro-team: '*' topics: @@ -16,8 +17,6 @@ People with admin permissions for a repository can enforce HTTPS for a {% data v All {% data variables.product.prodname_pages %} sites, including sites that are correctly configured with a custom domain, support HTTPS and HTTPS enforcement. For more information about custom domains, see "[About custom domains and {% data variables.product.prodname_pages %}](/articles/about-custom-domains-and-github-pages)" and "[Troubleshooting custom domains and {% data variables.product.prodname_pages %}](/articles/troubleshooting-custom-domains-and-github-pages#https-errors)." -HTTPS enforcement is required for {% data variables.product.prodname_pages %} sites using a `github.io` domain that were created after June 15, 2016. If you created your site before June 15, 2016, you can manually enable HTTPS enforcement. - {% data reusables.pages.no_sensitive_data_pages %} {% data reusables.pages.private_pages_are_public_warning %} @@ -26,6 +25,7 @@ HTTPS enforcement is required for {% data variables.product.prodname_pages %} si {% data reusables.pages.navigate-site-repo %} {% data reusables.repositories.sidebar-settings %} +{% data reusables.pages.sidebar-pages %} 3. Under "{% data variables.product.prodname_pages %}," select **Enforce HTTPS**. ![Enforce HTTPS checkbox](/assets/images/help/pages/enforce-https-checkbox.png) diff --git a/content/github/working-with-github-pages/unpublishing-a-github-pages-site.md b/content/pages/getting-started-with-github-pages/unpublishing-a-github-pages-site.md similarity index 94% rename from content/github/working-with-github-pages/unpublishing-a-github-pages-site.md rename to content/pages/getting-started-with-github-pages/unpublishing-a-github-pages-site.md index 912cc52b6f..496dbe75f9 100644 --- a/content/github/working-with-github-pages/unpublishing-a-github-pages-site.md +++ b/content/pages/getting-started-with-github-pages/unpublishing-a-github-pages-site.md @@ -7,6 +7,7 @@ redirect_from: - /articles/unpublishing-a-project-pages-site/ - /articles/unpublishing-a-user-pages-site/ - /articles/unpublishing-a-github-pages-site + - /github/working-with-github-pages/unpublishing-a-github-pages-site product: '{% data reusables.gated-features.pages %}' permissions: 'People with admin or maintainer permissions for a repository can unpublish a {% data variables.product.prodname_pages %} site.' versions: @@ -23,6 +24,7 @@ topics: 2. If a `gh-pages` branch exists in the repository, delete the `gh-pages` branch. For more information, see "[Creating and deleting branches within your repository](/articles/creating-and-deleting-branches-within-your-repository#deleting-a-branch)." 3. If the `gh-pages` branch was your publishing source, {% if currentVersion == "free-pro-team@latest" %}skip to step 6{% else %}your site is now unpublished and you can skip the remaining steps{% endif %}. {% data reusables.repositories.sidebar-settings %} +{% data reusables.pages.sidebar-pages %} 5. Under "{% data variables.product.prodname_pages %}", use the **Source** drop-down menu and select **None.** ![Drop down menu to select a publishing source](/assets/images/help/pages/publishing-source-drop-down.png) {% data reusables.pages.update_your_dns_settings %} diff --git a/content/github/working-with-github-pages/using-submodules-with-github-pages.md b/content/pages/getting-started-with-github-pages/using-submodules-with-github-pages.md similarity index 94% rename from content/github/working-with-github-pages/using-submodules-with-github-pages.md rename to content/pages/getting-started-with-github-pages/using-submodules-with-github-pages.md index a68562a1ce..cfedbd2ff5 100644 --- a/content/github/working-with-github-pages/using-submodules-with-github-pages.md +++ b/content/pages/getting-started-with-github-pages/using-submodules-with-github-pages.md @@ -4,6 +4,7 @@ intro: 'You can use submodules with {% data variables.product.prodname_pages %} redirect_from: - /articles/using-submodules-with-pages/ - /articles/using-submodules-with-github-pages + - /github/working-with-github-pages/using-submodules-with-github-pages product: '{% data reusables.gated-features.pages %}' versions: free-pro-team: '*' diff --git a/content/pages/index.md b/content/pages/index.md new file mode 100644 index 0000000000..999d83dbad --- /dev/null +++ b/content/pages/index.md @@ -0,0 +1,25 @@ +--- +title: GitHub Pages Documentation +shortTitle: GitHub Pages +intro: 'You can create a website directly from a {% data variables.product.product_name %} repository.' +redirect_from: + - /categories/20/articles/ + - /categories/95/articles/ + - /categories/github-pages-features/ + - /pages/ + - /categories/96/articles/ + - /categories/github-pages-troubleshooting/ + - /categories/working-with-github-pages + - /github/working-with-github-pages +product: '{% data reusables.gated-features.pages %}' +versions: + free-pro-team: '*' + enterprise-server: '*' + github-ae: '*' +topics: + - pages +--- + +{% link_with_intro /getting-started-with-github-pages %} +{% link_with_intro /setting-up-a-github-pages-site-with-jekyll %} +{% link_with_intro /configuring-a-custom-domain-for-your-github-pages-site %} \ No newline at end of file diff --git a/content/github/working-with-github-pages/about-github-pages-and-jekyll.md b/content/pages/setting-up-a-github-pages-site-with-jekyll/about-github-pages-and-jekyll.md similarity index 99% rename from content/github/working-with-github-pages/about-github-pages-and-jekyll.md rename to content/pages/setting-up-a-github-pages-site-with-jekyll/about-github-pages-and-jekyll.md index 29cb2ecc6a..ddd7ac0019 100644 --- a/content/github/working-with-github-pages/about-github-pages-and-jekyll.md +++ b/content/pages/setting-up-a-github-pages-site-with-jekyll/about-github-pages-and-jekyll.md @@ -17,6 +17,7 @@ redirect_from: - /articles/using-jekyll-plugins-with-github-pages/ - /articles/adding-jekyll-plugins-to-a-github-pages-site/ - /articles/about-github-pages-and-jekyll + - /github/working-with-github-pages/about-github-pages-and-jekyll product: '{% data reusables.gated-features.pages %}' versions: free-pro-team: '*' diff --git a/content/github/working-with-github-pages/about-jekyll-build-errors-for-github-pages-sites.md b/content/pages/setting-up-a-github-pages-site-with-jekyll/about-jekyll-build-errors-for-github-pages-sites.md similarity index 98% rename from content/github/working-with-github-pages/about-jekyll-build-errors-for-github-pages-sites.md rename to content/pages/setting-up-a-github-pages-site-with-jekyll/about-jekyll-build-errors-for-github-pages-sites.md index aaac77ac7d..9b2ffcb839 100644 --- a/content/github/working-with-github-pages/about-jekyll-build-errors-for-github-pages-sites.md +++ b/content/pages/setting-up-a-github-pages-site-with-jekyll/about-jekyll-build-errors-for-github-pages-sites.md @@ -5,6 +5,7 @@ redirect_from: - /articles/viewing-jekyll-build-error-messages/ - /articles/generic-jekyll-build-failures/ - /articles/about-jekyll-build-errors-for-github-pages-sites + - /github/working-with-github-pages/about-jekyll-build-errors-for-github-pages-sites product: '{% data reusables.gated-features.pages %}' versions: free-pro-team: '*' diff --git a/content/github/working-with-github-pages/adding-a-theme-to-your-github-pages-site-using-jekyll.md b/content/pages/setting-up-a-github-pages-site-with-jekyll/adding-a-theme-to-your-github-pages-site-using-jekyll.md similarity index 97% rename from content/github/working-with-github-pages/adding-a-theme-to-your-github-pages-site-using-jekyll.md rename to content/pages/setting-up-a-github-pages-site-with-jekyll/adding-a-theme-to-your-github-pages-site-using-jekyll.md index 99062c6ee8..c10d92fb3f 100644 --- a/content/github/working-with-github-pages/adding-a-theme-to-your-github-pages-site-using-jekyll.md +++ b/content/pages/setting-up-a-github-pages-site-with-jekyll/adding-a-theme-to-your-github-pages-site-using-jekyll.md @@ -5,6 +5,7 @@ redirect_from: - /articles/customizing-css-and-html-in-your-jekyll-theme/ - /articles/adding-a-jekyll-theme-to-your-github-pages-site/ - /articles/adding-a-theme-to-your-github-pages-site-using-jekyll + - /github/working-with-github-pages/adding-a-theme-to-your-github-pages-site-using-jekyll product: '{% data reusables.gated-features.pages %}' versions: free-pro-team: '*' diff --git a/content/github/working-with-github-pages/adding-content-to-your-github-pages-site-using-jekyll.md b/content/pages/setting-up-a-github-pages-site-with-jekyll/adding-content-to-your-github-pages-site-using-jekyll.md similarity index 98% rename from content/github/working-with-github-pages/adding-content-to-your-github-pages-site-using-jekyll.md rename to content/pages/setting-up-a-github-pages-site-with-jekyll/adding-content-to-your-github-pages-site-using-jekyll.md index bf7966fab7..a2bba40854 100644 --- a/content/github/working-with-github-pages/adding-content-to-your-github-pages-site-using-jekyll.md +++ b/content/pages/setting-up-a-github-pages-site-with-jekyll/adding-content-to-your-github-pages-site-using-jekyll.md @@ -4,6 +4,7 @@ intro: 'You can add a new page or post to your Jekyll site on {% data variables. product: '{% data reusables.gated-features.pages %}' redirect_from: - /articles/adding-content-to-your-github-pages-site-using-jekyll + - /github/working-with-github-pages/adding-content-to-your-github-pages-site-using-jekyll versions: free-pro-team: '*' enterprise-server: '*' diff --git a/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md b/content/pages/setting-up-a-github-pages-site-with-jekyll/creating-a-github-pages-site-with-jekyll.md similarity index 96% rename from content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md rename to content/pages/setting-up-a-github-pages-site-with-jekyll/creating-a-github-pages-site-with-jekyll.md index bf7f5f5cb1..b42ed0a38c 100644 --- a/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md +++ b/content/pages/setting-up-a-github-pages-site-with-jekyll/creating-a-github-pages-site-with-jekyll.md @@ -4,6 +4,7 @@ intro: 'You can use Jekyll to create a {% data variables.product.prodname_pages product: '{% data reusables.gated-features.pages %}' redirect_from: - /articles/creating-a-github-pages-site-with-jekyll + - /github/working-with-github-pages/creating-a-github-pages-site-with-jekyll permissions: 'People with admin permissions for a repository can create a {% data variables.product.prodname_pages %} site with Jekyll.' versions: free-pro-team: '*' @@ -100,7 +101,9 @@ $ git remote add origin https://HOSTNAME/USER/REPOSITORY/issues`: ```shell -$ curl -i -H "Authorization: token {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" or currentVersion == "github-ae@next" %}ghp_16C7e42F292c6912E7710c838347Ae178B4a"{% else %}5199831f4dd3b79e7c5b7e0ebe75d67aa66e79d4{% endif %}" \ +$ curl -i -H "Authorization: token {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" or currentVersion == "github-ae@next" %}ghp_16C7e42F292c6912E7710c838347Ae178B4a{% else %}5199831f4dd3b79e7c5b7e0ebe75d67aa66e79d4{% endif %}" \ {% data variables.product.api_url_pre %}/orgs/rails/issues ``` @@ -336,7 +336,7 @@ body to the `/issues` path underneath the repository in which we want to create the issue: ```shell -$ curl -i -H 'Authorization: token {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" or currentVersion == "github-ae@next" %}ghp_16C7e42F292c6912E7710c838347Ae178B4a"{% else %}5199831f4dd3b79e7c5b7e0ebe75d67aa66e79d4{% endif %}' \ +$ curl -i -H 'Authorization: token {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" or currentVersion == "github-ae@next" %}ghp_16C7e42F292c6912E7710c838347Ae178B4a{% else %}5199831f4dd3b79e7c5b7e0ebe75d67aa66e79d4{% endif %}' \ $ -d '{ \ $ "title": "New logo", \ $ "body": "We should have one", \ diff --git a/content/rest/reference/enterprise-admin.md b/content/rest/reference/enterprise-admin.md index eca5f8f968..cd3ab0d575 100644 --- a/content/rest/reference/enterprise-admin.md +++ b/content/rest/reference/enterprise-admin.md @@ -103,7 +103,7 @@ The IdP must use `{% data variables.product.api_url_code %}/scim/v2/enterprises/ {% note %} -**Note:** The enterprise SCIM API is only available to enterprises on [{% data variables.product.prodname_ghe_cloud %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-accounts) with [SAML SSO](/rest/overview/other-authentication-methods#authenticating-for-saml-sso) enabled. For more information about SCIM, see "[About SCIM](/github/setting-up-and-managing-organizations-and-teams/about-scim)." +**Note:** The enterprise SCIM API is only available to enterprises on [{% data variables.product.prodname_ghe_cloud %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-accounts) with [SAML SSO](/rest/overview/other-authentication-methods#authenticating-for-saml-sso) enabled. For more information about SCIM, see "[About SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)." {% endnote %} diff --git a/content/rest/reference/migrations.md b/content/rest/reference/migrations.md index c75353316f..f7730ab50d 100644 --- a/content/rest/reference/migrations.md +++ b/content/rest/reference/migrations.md @@ -16,7 +16,7 @@ topics: ## Organization -The Migrations API is only available to authenticated organization owners. For more information, see "[Permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization#permission-levels-for-an-organization)" and "[Other authentication methods](/rest/overview/other-authentication-methods)." +The Migrations API is only available to authenticated organization owners. For more information, see "[Permission levels for an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/permission-levels-for-an-organization#permission-levels-for-an-organization)" and "[Other authentication methods](/rest/overview/other-authentication-methods)." {% data variables.migrations.organization_migrations_intro %} diff --git a/content/rest/reference/repos.md b/content/rest/reference/repos.md index 21016d9516..05ced5bf56 100644 --- a/content/rest/reference/repos.md +++ b/content/rest/reference/repos.md @@ -200,7 +200,7 @@ The authenticated user will be the author of any merges done through this endpoi ## Pages -The {% data variables.product.prodname_pages %} API retrieves information about your {% data variables.product.prodname_pages %} configuration, and the statuses of your builds. Information about the site and the builds can only be accessed by authenticated owners{% if currentVersion != "github-ae@latest" %}, even if the websites are public{% endif %}. For more information, see "[About {% data variables.product.prodname_pages %}](/github/working-with-github-pages/about-github-pages)." +The {% data variables.product.prodname_pages %} API retrieves information about your {% data variables.product.prodname_pages %} configuration, and the statuses of your builds. Information about the site and the builds can only be accessed by authenticated owners{% if currentVersion != "github-ae@latest" %}, even if the websites are public{% endif %}. For more information, see "[About {% data variables.product.prodname_pages %}](/pages/getting-started-with-github-pages/about-github-pages)." In {% data variables.product.prodname_pages %} API endpoints with a `status` key in their response, the value can be one of: * `null`: The site has yet to be built. @@ -212,7 +212,7 @@ In {% data variables.product.prodname_pages %} API endpoints with a `status` key In {% data variables.product.prodname_pages %} API endpoints that return GitHub Pages site information, the JSON responses include these fields: * `html_url`: The absolute URL (including scheme) of the rendered Pages site. For example, `https://username.github.io`. * `source`: An object that contains the source branch and directory for the rendered Pages site. This includes: - - `branch`: The repository branch used to publish your [site's source files](/github/working-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site). For example, _main_ or _gh-pages_. + - `branch`: The repository branch used to publish your [site's source files](/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site). For example, _main_ or _gh-pages_. - `path`: The repository directory from which the site publishes. Will be either `/` or `/docs`. {% for operation in currentRestOperations %} diff --git a/content/rest/reference/scim.md b/content/rest/reference/scim.md index df50c65a89..58b0e286bc 100644 --- a/content/rest/reference/scim.md +++ b/content/rest/reference/scim.md @@ -14,7 +14,7 @@ The SCIM API is used by SCIM-enabled Identity Providers (IdPs) to automate provi {% note %} -**Note:** The SCIM API is available only to organizations on [{% data variables.product.prodname_ghe_cloud %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-accounts) with [SAML SSO](/rest/overview/other-authentication-methods#authenticating-for-saml-sso) enabled. For more information about SCIM, see "[About SCIM](/github/setting-up-and-managing-organizations-and-teams/about-scim)." +**Note:** The SCIM API is available only to organizations on [{% data variables.product.prodname_ghe_cloud %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-accounts) with [SAML SSO](/rest/overview/other-authentication-methods#authenticating-for-saml-sso) enabled. For more information about SCIM, see "[About SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)." {% endnote %} diff --git a/content/rest/reference/teams.md b/content/rest/reference/teams.md index 7f6b2a3bf4..d98f01e647 100644 --- a/content/rest/reference/teams.md +++ b/content/rest/reference/teams.md @@ -18,7 +18,7 @@ This API is only available to authenticated members of the team's [organization] ## Discussions -The team discussions API allows you to get, create, edit, and delete discussion posts on a team's page. You can use team discussions to have conversations that are not specific to a repository or project. Any member of the team's [organization](/rest/reference/orgs) can create and read public discussion posts. For more details, see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions/)." To learn more about commenting on a discussion post, see the [team discussion comments API](/rest/reference/teams#discussion-comments). This API is only available to authenticated members of the team's organization. +The team discussions API allows you to get, create, edit, and delete discussion posts on a team's page. You can use team discussions to have conversations that are not specific to a repository or project. Any member of the team's [organization](/rest/reference/orgs) can create and read public discussion posts. For more details, see "[About team discussions](//organizations/collaborating-with-your-team/about-team-discussions/)." To learn more about commenting on a discussion post, see the [team discussion comments API](/rest/reference/teams#discussion-comments). This API is only available to authenticated members of the team's organization. {% for operation in currentRestOperations %} {% if operation.subcategory == 'discussions' %}{% include rest_operation %}{% endif %} @@ -26,7 +26,7 @@ The team discussions API allows you to get, create, edit, and delete discussion ## Discussion comments -The team discussion comments API allows you to get, create, edit, and delete discussion comments on a [team discussion](/rest/reference/teams#discussions) post. Any member of the team's [organization](/rest/reference/orgs) can create and read comments on a public discussion. For more details, see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions/)." This API is only available to authenticated members of the team's organization. +The team discussion comments API allows you to get, create, edit, and delete discussion comments on a [team discussion](/rest/reference/teams#discussions) post. Any member of the team's [organization](/rest/reference/orgs) can create and read comments on a public discussion. For more details, see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions/)." This API is only available to authenticated members of the team's organization. {% for operation in currentRestOperations %} {% if operation.subcategory == 'discussion-comments' %}{% include rest_operation %}{% endif %} @@ -39,7 +39,7 @@ This API is only available to authenticated members of the team's organization. {% if currentVersion == "free-pro-team@latest" or enterpriseServerVersions contains currentVersion %} {% note %} -**Note:** When you have team synchronization set up for a team with your organization's identity provider (IdP), you will see an error if you attempt to use the API for making changes to the team's membership. If you have access to manage group membership in your IdP, you can manage GitHub team membership through your identity provider, which automatically adds and removes team members in an organization. For more information, see "Synchronizing teams between your identity provider and GitHub." +**Note:** When you have team synchronization set up for a team with your organization's identity provider (IdP), you will see an error if you attempt to use the API for making changes to the team's membership. If you have access to manage group membership in your IdP, you can manage GitHub team membership through your identity provider, which automatically adds and removes team members in an organization. For more information, see "Synchronizing teams between your identity provider and GitHub." {% endnote %} @@ -54,7 +54,7 @@ This API is only available to authenticated members of the team's organization. The Team Synchronization API allows you to manage connections between {% data variables.product.product_name %} teams and external identity provider (IdP) groups. To use this API, the authenticated user must be a team maintainer or an owner of the organization associated with the team. The token you use to authenticate will also need to be authorized for use with your IdP (SSO) provider. For more information, see "Authorizing a personal access token for use with a SAML single sign-on organization." -You can manage GitHub team members through your IdP with team synchronization. Team synchronization must be enabled to use the Team Synchronization API. For more information, see "Synchronizing teams between your identity provider and GitHub." +You can manage GitHub team members through your IdP with team synchronization. Team synchronization must be enabled to use the Team Synchronization API. For more information, see "Synchronizing teams between your identity provider and GitHub." {% for operation in currentRestOperations %} {% if operation.subcategory == 'team-sync' %}{% include rest_operation %}{% endif %} diff --git a/data/graphql/ghae/schema.docs-ghae.graphql b/data/graphql/ghae/schema.docs-ghae.graphql index 16a742623c..0a3dcff91b 100644 --- a/data/graphql/ghae/schema.docs-ghae.graphql +++ b/data/graphql/ghae/schema.docs-ghae.graphql @@ -31523,6 +31523,11 @@ type Sponsorship implements Node { The entity that is being sponsored """ sponsorable: Sponsorable! + + """ + Identifies the date and time when the current tier was chosen for this sponsorship. + """ + tierSelectedAt: DateTime } """ diff --git a/data/graphql/schema.docs.graphql b/data/graphql/schema.docs.graphql index 7af5bade0b..e430672198 100644 --- a/data/graphql/schema.docs.graphql +++ b/data/graphql/schema.docs.graphql @@ -34459,6 +34459,11 @@ type Sponsorship implements Node { The associated sponsorship tier """ tier: SponsorsTier + + """ + Identifies the date and time when the current tier was chosen for this sponsorship. + """ + tierSelectedAt: DateTime } """ diff --git a/data/products.yml b/data/products.yml deleted file mode 100644 index b942758ce1..0000000000 --- a/data/products.yml +++ /dev/null @@ -1,17 +0,0 @@ -# this sequence sets the product order in the sidebar -# the product IDs match keys in lib/all-products.js -# note this file should not be translated -productsInOrder: - - github - - admin - - discussions - - code-security - - actions - - packages - - developers - - rest - - graphql - - insights - - communities - - education - - desktop diff --git a/data/release-notes/2-21/18.yml b/data/release-notes/2-21/18.yml new file mode 100644 index 0000000000..2602e72c09 --- /dev/null +++ b/data/release-notes/2-21/18.yml @@ -0,0 +1,15 @@ +date: '2021-04-01' +sections: + security_fixes: + - "**HIGH:** An improper access control vulnerability was identified in GitHub Enterprise Server that allowed access tokens generated from a GitHub App's [web authentication flow](https://docs.github.com/en/developers/apps/identifying-and-authorizing-users-for-github-apps#web-application-flow) to read private repository metadata via the REST API without having been granted the appropriate permissions. To exploit this vulnerability, an attacker would need to create a GitHub App on the instance and have a user authorize the application through the web authentication flow. The private repository metadata returned would be limited to repositories owned by the user the token identifies. This vulnerability affected all versions of GitHub Enterprise Server prior to 3.0.4 and was fixed in versions 3.0.4, 2.22.10, 2.21.18. This vulnerability has been assigned CVE-2021-22865 and was reported via the [GitHub Bug Bounty Program](https://bounty.github.com)." + - Packages have been updated to the latest security versions. + bugs: + - Services were not transitioning to new log files as part of log rotation, resulting in increased disk usage. + - The label on search results for internal repositories was shown as "Private" instead of "Internal". + known_issues: + - On a freshly set up GitHub Enterprise Server without any users, an attacker could create the first admin user. + - Custom firewall rules are not maintained during an upgrade. + - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository. + - Issues cannot be closed if they contain a permalink to a blob in the same repository where the file path is longer than 255 characters. + - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results. + - Security alerts are not reported when pushing to a repository on the command line. diff --git a/data/release-notes/2-22/10.yml b/data/release-notes/2-22/10.yml new file mode 100644 index 0000000000..508bea029d --- /dev/null +++ b/data/release-notes/2-22/10.yml @@ -0,0 +1,15 @@ +date: '2021-04-01' +sections: + security_fixes: + - "**HIGH:** An improper access control vulnerability was identified in GitHub Enterprise Server that allowed access tokens generated from a GitHub App's [web authentication flow](https://docs.github.com/en/developers/apps/identifying-and-authorizing-users-for-github-apps#web-application-flow) to read private repository metadata via the REST API without having been granted the appropriate permissions. To exploit this vulnerability, an attacker would need to create a GitHub App on the instance and have a user authorize the application through the web authentication flow. The private repository metadata returned would be limited to repositories owned by the user the token identifies. This vulnerability affected all versions of GitHub Enterprise Server prior to 3.0.4 and was fixed in versions 3.0.4, 2.22.10, 2.21.18. This vulnerability has been assigned CVE-2021-22865 and was reported via the [GitHub Bug Bounty Program](https://bounty.github.com)." + - Packages have been updated to the latest security versions. + bugs: + - A timezone set on GitHub Enterprise 11.10.x or earlier was not being used by some services which were defaulting to UTC time. + - Services were not transitioning to new log files as part of log rotation, resulting in increased disk usage. + - The label on search results for internal repositories was shown as "Private" instead of "Internal". + known_issues: + - On a freshly set up GitHub Enterprise Server without any users, an attacker could create the first admin user. + - Custom firewall rules are not maintained during an upgrade. + - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository. + - Issues cannot be closed if they contain a permalink to a blob in the same repository where the file path is longer than 255 characters. + - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results. diff --git a/data/release-notes/3-0/4.yml b/data/release-notes/3-0/4.yml new file mode 100644 index 0000000000..dbd4727201 --- /dev/null +++ b/data/release-notes/3-0/4.yml @@ -0,0 +1,24 @@ +date: '2021-04-01' +intro: The minimum infrastructure requirements have increased for {% data variables.product.prodname_ghe_server %} 3.0+. For more information, see "[About minimum requirements for GitHub Enterprise Server 3.0 and later](/admin/enterprise-management/upgrading-github-enterprise-server#about-minimum-requirements-for-github-enterprise-server-30-and-later)." +sections: + security_fixes: + - "**HIGH:** An improper access control vulnerability was identified in GitHub Enterprise Server that allowed access tokens generated from a GitHub App's [web authentication flow](https://docs.github.com/en/developers/apps/identifying-and-authorizing-users-for-github-apps#web-application-flow) to read private repository metadata via the REST API without having been granted the appropriate permissions. To exploit this vulnerability, an attacker would need to create a GitHub App on the instance and have a user authorize the application through the web authentication flow. The private repository metadata returned would be limited to repositories owned by the user the token identifies. This vulnerability affected all versions of GitHub Enterprise Server prior to 3.0.4 and was fixed in versions 3.0.4, 2.22.10, 2.21.18. This vulnerability has been assigned CVE-2021-22865 and was reported via the [GitHub Bug Bounty Program](https://bounty.github.com)." + - Packages have been updated to the latest security versions. + bugs: + - When maintenance mode was enabled, some services continued to be listed as "active processes" even though they were expected to be running, and should not have been listed. + - After upgrading from 2.22.x to 3.0.x with GitHub Actions enabled, the self-hosted runner version was not updated and no self-hosted updates were made. + - Old GitHub Pages builds were not cleaned up leading to increased disk usage. + - '`memcached` was not running on active replicas.' + - Upgrade failed when updating file permissions when GitHub Actions was enabled. + - A timezone set on GitHub Enterprise 11.10.x or earlier was not being used by some services which were defaulting to UTC time. + - Services were not transitioning to new log files as part of log rotation, resulting in increased disk usage. + - The `ghe-saml-mapping-csv` command-line utility produced a warning message. + - The label on search results for internal repositories was shown as "Private" instead of "Internal". + known_issues: + - On a freshly set up GitHub Enterprise Server without any users, an attacker could create the first admin user. + - Custom firewall rules are not maintained during an upgrade. + - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository. + - Issues cannot be closed if they contain a permalink to a blob in the same repository where the file path is longer than 255 characters. + - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results. + - Jupyter Notebook rendering in the web UI may fail if the notebook includes non-ASCII UTF-8 characters. + - reStructuredText (RST) rendering in the web UI may fail and instead display raw RST markup text. diff --git a/data/reusables/actions/actions-audit-events-workflow.md b/data/reusables/actions/actions-audit-events-workflow.md index 612ea4fca1..3140c370cc 100644 --- a/data/reusables/actions/actions-audit-events-workflow.md +++ b/data/reusables/actions/actions-audit-events-workflow.md @@ -4,5 +4,7 @@ | `completed_workflow_run` | Triggered when a workflow status changes to `completed`. Can only be viewed using the REST API; not visible in the UI or the JSON/CSV export. For more information, see "[Viewing workflow run history](/actions/managing-workflow-runs/viewing-workflow-run-history)." | `created_workflow_run` | Triggered when a workflow run is created. Can only be viewed using the REST API; not visible in the UI or the JSON/CSV export. For more information, see "[Create an example workflow](/actions/learn-github-actions/introduction-to-github-actions#create-an-example-workflow)." | `delete_workflow_run` | Triggered when a workflow run is deleted. For more information, see "[Deleting a workflow run](/actions/managing-workflow-runs/deleting-a-workflow-run)." +| `disable_workflow` | Triggered when a workflow is disabled. +| `enable_workflow` | Triggered when a workflow is enabled, after previously being disabled by `disable_workflow`. | `rerun_workflow_run` | Triggered when a workflow run is re-run. For more information, see "[Re-running a workflow](/actions/managing-workflow-runs/re-running-a-workflow)." | `prepared_workflow_job` | Triggered when a workflow job is started. Includes the list of secrets that were provided to the job. Can only be viewed using the REST API; not visible in the UI or the JSON/CSV export. For more information, see "[Events that trigger workflows](/actions/reference/events-that-trigger-workflows)." diff --git a/data/reusables/advanced-security/about-ghas-organization-policy.md b/data/reusables/advanced-security/about-ghas-organization-policy.md index baa32fddac..b6abfe68c7 100644 --- a/data/reusables/advanced-security/about-ghas-organization-policy.md +++ b/data/reusables/advanced-security/about-ghas-organization-policy.md @@ -2,4 +2,4 @@ You can enforce a policy that controls whether repository administrators are allowed to enable features for {% data variables.product.prodname_advanced_security %} in an organization's repositories. You can configure a policy for all organizations owned by your enterprise account, or for individual organizations that you choose. -Disallowing {% data variables.product.prodname_advanced_security %} for an organization prevents repository administrators from enabling {% data variables.product.prodname_advanced_security %} features for additional repositories, but does not disable the features for repositories where the features are already enabled. For more information about configuration of {% data variables.product.prodname_advanced_security %} features, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization)" or "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)." +Disallowing {% data variables.product.prodname_advanced_security %} for an organization prevents repository administrators from enabling {% data variables.product.prodname_advanced_security %} features for additional repositories, but does not disable the features for repositories where the features are already enabled. For more information about configuration of {% data variables.product.prodname_advanced_security %} features, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization)" or "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)." diff --git a/data/reusables/branches/set-default-branch.md b/data/reusables/branches/set-default-branch.md index 20d94881f6..61c5fb0903 100644 --- a/data/reusables/branches/set-default-branch.md +++ b/data/reusables/branches/set-default-branch.md @@ -1 +1 @@ -You can set the name of the default branch for new repositories. For more information, see "[Managing the default branch for your repositories](/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories)," "[Managing the default branch name for repositories in your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-default-branch-name-for-repositories-in-your-organization)," and {% if currentVersion == "free-pro-team@latest" %}"[Enforcing repository management policies in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account#enforcing-a-policy-on-the-default-branch-name)."{% else %}"[Enforcing repository management policies in your enterprise](/admin/policies/enforcing-repository-management-policies-in-your-enterprise#enforcing-a-policy-on-the-default-branch-name)."{% endif %} +You can set the name of the default branch for new repositories. For more information, see "[Managing the default branch for your repositories](/github/setting-up-and-managing-your-github-user-account/managing-the-default-branch-name-for-your-repositories)," "[Managing the default branch name for repositories in your organization](/organizations/managing-organization-settings/managing-the-default-branch-name-for-repositories-in-your-organization)," and {% if currentVersion == "free-pro-team@latest" %}"[Enforcing repository management policies in your enterprise account](/github/setting-up-and-managing-your-enterprise/enforcing-repository-management-policies-in-your-enterprise-account#enforcing-a-policy-on-the-default-branch-name)."{% else %}"[Enforcing repository management policies in your enterprise](/admin/policies/enforcing-repository-management-policies-in-your-enterprise#enforcing-a-policy-on-the-default-branch-name)."{% endif %} diff --git a/data/reusables/classroom/assignments-guide-choose-visibility.md b/data/reusables/classroom/assignments-guide-choose-visibility.md index 3f4f17e1b2..303bb3669b 100644 --- a/data/reusables/classroom/assignments-guide-choose-visibility.md +++ b/data/reusables/classroom/assignments-guide-choose-visibility.md @@ -1,6 +1,6 @@ The repositories for an assignment can be public or private. If you use private repositories, only the student or team can see the feedback you provide. -You can also decide whether to grant students admin permissions to the repository for an assignment. Grant admin permissions if the student should be able to perform administrative tasks for the assignment repository. For more information, see "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)" and "[Repository permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization)." +You can also decide whether to grant students admin permissions to the repository for an assignment. Grant admin permissions if the student should be able to perform administrative tasks for the assignment repository. For more information, see "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility)" and "[Repository permission levels for an organization](/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization)." Under "Repository visibility", select a visibility. Optionally, select **Grant students admin access to their repository**. diff --git a/data/reusables/classroom/guide-create-new-classroom.md b/data/reusables/classroom/guide-create-new-classroom.md index 1ce37f9c07..9963eb960b 100644 --- a/data/reusables/classroom/guide-create-new-classroom.md +++ b/data/reusables/classroom/guide-create-new-classroom.md @@ -1,4 +1,4 @@ -1. In the list of organizations, click the organization you'd like to use for your classroom. Optionally, you can create a new organization. For more information, see "[Creating a new organization from scratch](/github/setting-up-and-managing-organizations-and-teams/creating-a-new-organization-from-scratch)." +1. In the list of organizations, click the organization you'd like to use for your classroom. Optionally, you can create a new organization. For more information, see "[Creating a new organization from scratch](/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch)." ![Organization in list of organizations for creating new classroom](/assets/images/help/classroom/click-organization.png) 1. Type the name for your classroom. ![Text field for typing name of classroom](/assets/images/help/classroom/type-classroom-name.png) diff --git a/data/reusables/dependabot/private-dependencies-note.md b/data/reusables/dependabot/private-dependencies-note.md index 7dd8f996d0..c3b22f4515 100644 --- a/data/reusables/dependabot/private-dependencies-note.md +++ b/data/reusables/dependabot/private-dependencies-note.md @@ -1 +1 @@ -When running security or version updates, some ecosystems must be able to resolve all dependencies from their source to verify that updates have been successful. If your manifest or lock files contain any private dependencies, {% data variables.product.prodname_dependabot %} must be able to access the location at which those dependencies are hosted. Organization owners can grant {% data variables.product.prodname_dependabot %} access to private repositories containing dependencies for a project within the same organization. For more information, see "[Managing security and analysis settings for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-security-and-analysis-settings-for-your-organization#allowing-dependabot-to-access-private-dependencies)." You can configure access to private registries in a repository's _dependabot.yml_ configuration file. For more information, see "[Configuration options for dependency updates](/github/administering-a-repository/configuration-options-for-dependency-updates#configuration-options-for-private-registries)." +When running security or version updates, some ecosystems must be able to resolve all dependencies from their source to verify that updates have been successful. If your manifest or lock files contain any private dependencies, {% data variables.product.prodname_dependabot %} must be able to access the location at which those dependencies are hosted. Organization owners can grant {% data variables.product.prodname_dependabot %} access to private repositories containing dependencies for a project within the same organization. For more information, see "[Managing security and analysis settings for your organization](/organizations/keeping-your-organization-secure/managing-security-and-analysis-settings-for-your-organization#allowing-dependabot-to-access-private-dependencies)." You can configure access to private registries in a repository's _dependabot.yml_ configuration file. For more information, see "[Configuration options for dependency updates](/github/administering-a-repository/configuration-options-for-dependency-updates#configuration-options-for-private-registries)." diff --git a/data/reusables/dotcom_billing/coupon-expires.md b/data/reusables/dotcom_billing/coupon-expires.md new file mode 100644 index 0000000000..71beb790aa --- /dev/null +++ b/data/reusables/dotcom_billing/coupon-expires.md @@ -0,0 +1 @@ +If you use a coupon to pay for a subscription, when the coupon expires, your payment method will be charged the full cost of your subscription. If you do not have a saved payment method, your account will be downgraded to {% data variables.product.prodname_free_user %} for user accounts or {% data variables.product.prodname_free_team %} for organizations. diff --git a/data/reusables/github-actions/java-jvm-architecture.md b/data/reusables/github-actions/java-jvm-architecture.md index 33c7bd3120..2814ee964b 100644 --- a/data/reusables/github-actions/java-jvm-architecture.md +++ b/data/reusables/github-actions/java-jvm-architecture.md @@ -2,16 +2,17 @@ The starter workflow template sets up the `PATH` to contain OpenJDK 8 for the x64 platform. If you want to use a different version of Java, or target a different architecture (`x64` or `x86`), you can use the `setup-java` action to choose a different Java runtime environment. -For example, to use version 9.0.4 of the JDK for the x64 platform, you can use the `setup-java` action and configure the `java-version` and `architecture` parameters to `'9.0.4'` and `x64`. +For example, to use version 11 of the JDK provided by Adoptium for the x64 platform, you can use the `setup-java` action and configure the `java-version`, `distribution` and `architecture` parameters to `'11'`, `'adopt'` and `x64`. {% raw %} ```yaml{:copy} steps: - uses: actions/checkout@v2 - - name: Set up JDK 9.0.4 for x64 - uses: actions/setup-java@v1 + - name: Set up JDK 11 for x64 + uses: actions/setup-java@v2 with: - java-version: '9.0.4' + java-version: '11' + distribution: 'adopt' architecture: x64 ``` {% endraw %} diff --git a/data/reusables/identity-and-permissions/revoking-identity-team-sync.md b/data/reusables/identity-and-permissions/revoking-identity-team-sync.md index b2c935e893..046848b19c 100644 --- a/data/reusables/identity-and-permissions/revoking-identity-team-sync.md +++ b/data/reusables/identity-and-permissions/revoking-identity-team-sync.md @@ -1,5 +1,5 @@ {% warning %} -**Warning:** If your organization uses team synchronization, revoking a person's SSO identity will remove that person from any teams mapped to IdP groups. For more information, see "[Synchronizing a team with an identity provider](/github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group)." +**Warning:** If your organization uses team synchronization, revoking a person's SSO identity will remove that person from any teams mapped to IdP groups. For more information, see "[Synchronizing a team with an identity provider](/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group)." {% endwarning %} diff --git a/data/reusables/identity-and-permissions/sync-team-with-idp-group.md b/data/reusables/identity-and-permissions/sync-team-with-idp-group.md index 125c285ead..0b4022951d 100644 --- a/data/reusables/identity-and-permissions/sync-team-with-idp-group.md +++ b/data/reusables/identity-and-permissions/sync-team-with-idp-group.md @@ -1 +1 @@ -After you enable team synchronization, team maintainers and organization owners can connect a team to an IdP group on {% data variables.product.prodname_dotcom %} or through the API. For more information, see "[Synchronizing a team with an identity provider group](/github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group)" and "[Team synchronization](/rest/reference/teams#team-sync)." +After you enable team synchronization, team maintainers and organization owners can connect a team to an IdP group on {% data variables.product.prodname_dotcom %} or through the API. For more information, see "[Synchronizing a team with an identity provider group](/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group)" and "[Team synchronization](/rest/reference/teams#team-sync)." diff --git a/data/reusables/identity-and-permissions/team-sync-confirm-saml.md b/data/reusables/identity-and-permissions/team-sync-confirm-saml.md index a0e1a12947..3ebd07b725 100644 --- a/data/reusables/identity-and-permissions/team-sync-confirm-saml.md +++ b/data/reusables/identity-and-permissions/team-sync-confirm-saml.md @@ -1 +1 @@ -3. Confirm that SAML SSO is enabled. For more information, see "[Managing SAML single sign-on for your organization](/articles/managing-saml-single-sign-on-for-your-organization)." +3. Confirm that SAML SSO is enabled. For more information, see "[Managing SAML single sign-on for your organization](/organizations/managing-saml-single-sign-on-for-your-organization/)." diff --git a/data/reusables/identity-and-permissions/team-sync-okta-requirements.md b/data/reusables/identity-and-permissions/team-sync-okta-requirements.md index f8ebbf4246..08aa1fad59 100644 --- a/data/reusables/identity-and-permissions/team-sync-okta-requirements.md +++ b/data/reusables/identity-and-permissions/team-sync-okta-requirements.md @@ -1,5 +1,5 @@ To enable team synchronization for Okta, you or your IdP administrator must: -- Enable SAML SSO and SCIM for your organization using Okta. For more information, see "[Configuring SAML single sign-on and SCIM using Okta](/github/setting-up-and-managing-organizations-and-teams/configuring-saml-single-sign-on-and-scim-using-okta)." +- Enable SAML SSO and SCIM for your organization using Okta. For more information, see "[Configuring SAML single sign-on and SCIM using Okta](/organizations/managing-saml-single-sign-on-for-your-organization/configuring-saml-single-sign-on-and-scim-using-okta)." - Provide the tenant URL for your Okta instance. - Generate a valid SSWS token with read-only admin permissions for your Okta installation as a service user. For more information, see [Create the token](https://developer.okta.com/docs/guides/create-an-api-token/create-the-token/) and [Service users](https://help.okta.com/en/prod/Content/Topics/Adv_Server_Access/docs/service-users.htm) in Okta's documentation. diff --git a/data/reusables/organizations/team-discussions-are-for-orgs.md b/data/reusables/organizations/team-discussions-are-for-orgs.md index cb0f53f8ed..656bb6a3b7 100644 --- a/data/reusables/organizations/team-discussions-are-for-orgs.md +++ b/data/reusables/organizations/team-discussions-are-for-orgs.md @@ -1 +1 @@ -Team discussions are only available on team pages in organizations. For more information, see "[About team discussions](/github/setting-up-and-managing-organizations-and-teams/about-team-discussions)." +Team discussions are only available on team pages in organizations. For more information, see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)." diff --git a/data/reusables/organizations/team-synchronization.md b/data/reusables/organizations/team-synchronization.md index a609ef11b9..94743620fb 100644 --- a/data/reusables/organizations/team-synchronization.md +++ b/data/reusables/organizations/team-synchronization.md @@ -1,3 +1,3 @@ {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" %} -You can use team synchronization to automatically add and remove organization members to teams through an identity provider. For more information, see "[Synchronizing a team with an identity provider group](/github/setting-up-and-managing-organizations-and-teams/synchronizing-a-team-with-an-identity-provider-group)." +You can use team synchronization to automatically add and remove organization members to teams through an identity provider. For more information, see "[Synchronizing a team with an identity provider group](/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group)." {% endif %} diff --git a/data/reusables/organizations/team_maintainers_can.md b/data/reusables/organizations/team_maintainers_can.md index 586a4657f5..8c68c29077 100644 --- a/data/reusables/organizations/team_maintainers_can.md +++ b/data/reusables/organizations/team_maintainers_can.md @@ -11,5 +11,5 @@ Members with team maintainer permissions can: - [Remove organization members from the team](/articles/removing-organization-members-from-a-team) - [Promote an existing team member to team maintainer](/articles/giving-team-maintainer-permissions-to-an-organization-member) - Remove the team's access to repositories{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" or currentVersion == "github-ae@latest" %} -- [Manage code review assignment for the team](/github/setting-up-and-managing-organizations-and-teams/managing-code-review-assignment-for-your-team){% endif %}{% if currentVersion == "free-pro-team@latest" %} +- [Manage code review assignment for the team](/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team){% endif %}{% if currentVersion == "free-pro-team@latest" %} - [Manage scheduled reminders for pull requests](/github/setting-up-and-managing-organizations-and-teams/managing-scheduled-reminders-for-pull-requests){% endif %} diff --git a/data/reusables/pages/choose-visibility.md b/data/reusables/pages/choose-visibility.md index 2f9e310e5e..464776a288 100644 --- a/data/reusables/pages/choose-visibility.md +++ b/data/reusables/pages/choose-visibility.md @@ -1,2 +1,2 @@ -1. Optionally, if you're publishing a project site from a private or internal repository owned by an organization using {% data variables.product.prodname_ghe_cloud %}, choose the visibility for your site. Under "{% data variables.product.prodname_pages %}", select the **{% data variables.product.prodname_pages %} visibility** drop-down menu, then click a visibility. For more information, see "[Changing the visibility of your {% data variables.product.prodname_pages %} site](/github/working-with-github-pages/changing-the-visibility-of-your-github-pages-site)". +1. Optionally, if you're publishing a project site from a private or internal repository owned by an organization using {% data variables.product.prodname_ghe_cloud %}, choose the visibility for your site. Under "{% data variables.product.prodname_pages %}", select the **{% data variables.product.prodname_pages %} visibility** drop-down menu, then click a visibility. For more information, see "[Changing the visibility of your {% data variables.product.prodname_pages %} site](/pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site)". ![Drop-down to select visibility for your site](/assets/images/help/pages/public-or-private-visibility.png) \ No newline at end of file diff --git a/data/reusables/pages/org-owners-can-restrict-pages-creation.md b/data/reusables/pages/org-owners-can-restrict-pages-creation.md index fc98787aaa..26d5ca7f58 100644 --- a/data/reusables/pages/org-owners-can-restrict-pages-creation.md +++ b/data/reusables/pages/org-owners-can-restrict-pages-creation.md @@ -1,7 +1,7 @@ {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %} {% note %} -**Note:** Organization owners can restrict the publication of {% data variables.product.prodname_pages %} sites from repositories owned by the organization. For more information, see "[Managing the publication of {% data variables.product.prodname_pages %} sites](/github/setting-up-and-managing-organizations-and-teams/managing-the-publication-of-github-pages-sites-for-your-organization)." +**Note:** Organization owners can restrict the publication of {% data variables.product.prodname_pages %} sites from repositories owned by the organization. For more information, see "[Managing the publication of {% data variables.product.prodname_pages %} sites](/organizations/managing-organization-settings/managing-the-publication-of-github-pages-sites-for-your-organization)." {% endnote %} {% endif %} \ No newline at end of file diff --git a/data/reusables/pages/private_pages_are_public_warning.md b/data/reusables/pages/private_pages_are_public_warning.md index 04d4ddeb1c..e8de190b64 100644 --- a/data/reusables/pages/private_pages_are_public_warning.md +++ b/data/reusables/pages/private_pages_are_public_warning.md @@ -1,5 +1,5 @@ {% warning %} -**Warning**: {% if enterpriseServerVersions contains currentVersion or currentVersion == "github-ae@latest" %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet{% if currentVersion == "free-pro-team@latest" %} by default{% endif %}, even if the repository for the site is private or internal.{% if currentVersion == "free-pro-team@latest" %} {% data reusables.pages.about-private-publishing %} Otherwise, if{% else %} If{% endif %} you have sensitive data in your site's repository, you may want to remove the data before publishing. For more information, see{% if enterpriseServerVersions contains currentVersion or currentVersion == "github-ae@latest" %} "[Configuring {% data variables.product.prodname_pages %} for your enterprise](/admin/configuration/configuring-github-pages-for-your-enterprise#enabling-public-sites-for-github-pages)" and{% endif %} "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility){% if currentVersion == "free-pro-team@latest" %}" and "[Changing the visibility of your {% data variables.product.prodname_pages %} site](/github/working-with-github-pages/changing-the-visibility-of-your-github-pages-site)."{% else %}."{% endif %} +**Warning**: {% if enterpriseServerVersions contains currentVersion or currentVersion == "github-ae@latest" %}If your site administrator has enabled Public Pages, {% endif %}{% data variables.product.prodname_pages %} sites are publicly available on the internet{% if currentVersion == "free-pro-team@latest" %} by default{% endif %}, even if the repository for the site is private or internal.{% if currentVersion == "free-pro-team@latest" %} {% data reusables.pages.about-private-publishing %} Otherwise, if{% else %} If{% endif %} you have sensitive data in your site's repository, you may want to remove the data before publishing. For more information, see{% if enterpriseServerVersions contains currentVersion or currentVersion == "github-ae@latest" %} "[Configuring {% data variables.product.prodname_pages %} for your enterprise](/admin/configuration/configuring-github-pages-for-your-enterprise#enabling-public-sites-for-github-pages)" and{% endif %} "[About repository visibility](/github/creating-cloning-and-archiving-repositories/about-repository-visibility){% if currentVersion == "free-pro-team@latest" %}" and "[Changing the visibility of your {% data variables.product.prodname_pages %} site](/pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site)."{% else %}."{% endif %} {% endwarning %} diff --git a/data/reusables/pages/sidebar-pages.md b/data/reusables/pages/sidebar-pages.md new file mode 100644 index 0000000000..ee091cff7a --- /dev/null +++ b/data/reusables/pages/sidebar-pages.md @@ -0,0 +1,4 @@ +{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.1" %} +1. In the left sidebar, click **Pages**. + ![Page tab in the left-hand sidebar](/assets/images/help/pages/pages-tab.png) +{% endif %} diff --git a/data/reusables/pages/update_your_dns_settings.md b/data/reusables/pages/update_your_dns_settings.md index 67317a2a04..6bb9bacc45 100644 --- a/data/reusables/pages/update_your_dns_settings.md +++ b/data/reusables/pages/update_your_dns_settings.md @@ -1 +1 @@ -{% if currentVersion == "free-pro-team@latest" %}1. If there's a custom domain enabled for your site, to avoid a domain takeover, update your DNS settings. For more information, see "[Configuring a custom domain for your {% data variables.product.prodname_pages %} site](/articles/configuring-a-custom-domain-for-your-github-pages-site)."{% endif %} +{% if currentVersion == "free-pro-team@latest" %}1. If there's a custom domain enabled for your site, to avoid a domain takeover, update your DNS settings. For more information, see "[Configuring a custom domain for your {% data variables.product.prodname_pages %} site](/pages/configuring-a-custom-domain-for-your-github-pages-site)."{% endif %} diff --git a/data/reusables/pages/www-and-apex-domain-recommendation.md b/data/reusables/pages/www-and-apex-domain-recommendation.md index dbb2dd1416..f94b04d6d4 100644 --- a/data/reusables/pages/www-and-apex-domain-recommendation.md +++ b/data/reusables/pages/www-and-apex-domain-recommendation.md @@ -1 +1 @@ -If you are using an apex domain as your custom domain, we recommend also setting up a `www` subdomain. If you configure the correct records for each domain type through your DNS provider, {% data variables.product.prodname_pages %} will automatically create redirects between the domains. For example, if you configure `www.example.com` as the custom domain for your site, and you have {% data variables.product.prodname_pages %} DNS records set up for the apex and `www` domains, then `example.com` will redirect to `www.example.com`. Note that automatic redirects only apply to the `www` subdomain. Automatic redirects do not apply to any other subdomains, such as `blog`. \ No newline at end of file +If you are using an apex domain as your custom domain, we recommend also setting up a `www` subdomain. If you configure the correct records for each domain type through your DNS provider, {% data variables.product.prodname_pages %} will automatically create redirects between the domains. For example, if you configure `www.example.com` as the custom domain for your site, and you have {% data variables.product.prodname_pages %} DNS records set up for the apex and `www` domains, then `example.com` will redirect to `www.example.com`. Note that automatic redirects only apply to the `www` subdomain. Automatic redirects do not apply to any other subdomains, such as `blog`. diff --git a/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md b/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md index 979cf68329..3dc1d84355 100644 --- a/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md +++ b/data/reusables/repositories/deleted_forks_from_private_repositories_warning.md @@ -6,6 +6,6 @@ - When [LDAP Sync is enabled](/enterprise/admin/authentication/using-ldap#enabling-ldap-sync), if you remove a person from a repository, they will lose access but their forks will not be deleted. If the person is added to a team with access to the original organization repository within three months, their access to the forks will be automatically restored on the next sync.{% endif %} - You are responsible for ensuring that people who have lost access to a repository delete any confidential information or intellectual property. -- People with admin permissions to a private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" or currentVersion == "github-ae@latest" %} or internal{% endif %} repository can disallow forking of that repository, and organization owners can disallow forking of any private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" or currentVersion == "github-ae@latest" %} or internal{% endif %} repository in an organization. For more information, see "[Managing the forking policy for your organization](/github/setting-up-and-managing-organizations-and-teams/managing-the-forking-policy-for-your-organization)" and "[Managing the forking policy for your repository](/github/administering-a-repository/managing-the-forking-policy-for-your-repository)." +- People with admin permissions to a private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" or currentVersion == "github-ae@latest" %} or internal{% endif %} repository can disallow forking of that repository, and organization owners can disallow forking of any private{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" or currentVersion == "github-ae@latest" %} or internal{% endif %} repository in an organization. For more information, see "[Managing the forking policy for your organization](/organizations/managing-organization-settings/managing-the-forking-policy-for-your-organization)" and "[Managing the forking policy for your repository](/github/administering-a-repository/managing-the-forking-policy-for-your-repository)." {% endwarning %} diff --git a/data/reusables/saml/about-linked-identities.md b/data/reusables/saml/about-linked-identities.md index 4f489081c2..f879d16402 100644 --- a/data/reusables/saml/about-linked-identities.md +++ b/data/reusables/saml/about-linked-identities.md @@ -1,3 +1,3 @@ -You can view the single sign-on identity that a member has linked to their {% data variables.product.product_name %} account. When available, the entry will include SCIM data. For more information, see "[About SCIM](/github/setting-up-and-managing-organizations-and-teams/about-scim)." +You can view the single sign-on identity that a member has linked to their {% data variables.product.product_name %} account. When available, the entry will include SCIM data. For more information, see "[About SCIM](/organizations/managing-saml-single-sign-on-for-your-organization/about-scim)." If a member links the wrong identity to their {% data variables.product.product_name %} account, you can revoke the linked identity to allow the member to try again. diff --git a/data/reusables/saml/outside-collaborators-exemption.md b/data/reusables/saml/outside-collaborators-exemption.md index f2936af1c5..598f6e88d5 100644 --- a/data/reusables/saml/outside-collaborators-exemption.md +++ b/data/reusables/saml/outside-collaborators-exemption.md @@ -1,5 +1,5 @@ {% note %} -**Note:** Outside collaborators aren't required to authenticate with an IdP to access the resources in an organization with SAML SSO. For more information on outside collaborators, see "[Permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization#outside-collaborators)." +**Note:** Outside collaborators aren't required to authenticate with an IdP to access the resources in an organization with SAML SSO. For more information on outside collaborators, see "[Permission levels for an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/permission-levels-for-an-organization#outside-collaborators)." {% endnote %} diff --git a/data/reusables/secret-scanning/partner-secret-list-private-repo.md b/data/reusables/secret-scanning/partner-secret-list-private-repo.md index f8d379e510..b6dae162f9 100644 --- a/data/reusables/secret-scanning/partner-secret-list-private-repo.md +++ b/data/reusables/secret-scanning/partner-secret-list-private-repo.md @@ -7,6 +7,7 @@ Alibaba Cloud | Alibaba Cloud Access Key ID | alibaba_cloud_access_key_id Alibaba Cloud | Alibaba Cloud Access Key Secret | alibaba_cloud_access_key_secret Amazon Web Services (AWS) | Amazon AWS Access Key ID | aws_access_key_id Amazon Web Services (AWS) | Amazon AWS Secret Access Key | aws_secret_access_key +Asana | Asana Personal Access Token | asana_personal_access_token Atlassian | Atlassian API Token | atlassian_api_token Atlassian | Atlassian JSON Web Token | atlassian_jwt Azure | Azure DevOps Personal Access Token | azure_devops_personal_access_token @@ -37,8 +38,12 @@ GoCardless | GoCardless Live Access Token | gocardless_live_access_token GoCardless | GoCardless Sandbox Access Token | gocardless_sandbox_access_token Google Cloud | Google API Key | google_api_key Google Cloud | Google Cloud Private Key ID | google_cloud_private_key_id +Grafana | Grafana API Key | grafana_api_key Hashicorp Terraform | Terraform Cloud / Enterprise API Token | terraform_api_token Hubspot | Hubspot API Key | hubspot_api_key +Intercom | Intercom Access Token | intercom_access_token +Lob | Lob Live API Key | lob_live_api_key +Lob | Lob Test API Key | lob_test_api_key Mailchimp | Mailchimp API Key | mailchimp_api_key Mailgun | Mailgun API Key | mailgun_api_key npm | npm Access Token | npm_access_token @@ -51,6 +56,7 @@ Proctorio | Proctorio Registration Key | proctorio_registration_key Proctorio | Proctorio Secret Key | proctorio_secret_key Pulumi | Pulumi Access Token | pulumi_access_token PyPI | PyPI API Token | pypi_api_token +RubyGems | RubyGems API Key | rubygems_api_key Samsara | Samsara API Token | samsara_api_token Samsara | Samsara OAuth Access Token | samsara_oauth_access_token SendGrid | SendGrid API Key | sendgrid_api_key diff --git a/data/reusables/secret-scanning/partner-secret-list-public-repo.md b/data/reusables/secret-scanning/partner-secret-list-public-repo.md index 0577b865d9..f9a5625825 100644 --- a/data/reusables/secret-scanning/partner-secret-list-public-repo.md +++ b/data/reusables/secret-scanning/partner-secret-list-public-repo.md @@ -50,6 +50,7 @@ Proctorio | Proctorio Registration Key Proctorio | Proctorio Secret Key Pulumi | Pulumi Access Token PyPI | PyPI API Token +RubyGems | RubyGems API Key Samsara | Samsara API Token Samsara | Samsara OAuth Access Token Shopify | Shopify App Shared Secret diff --git a/data/reusables/sponsors/choose-updates.md b/data/reusables/sponsors/choose-updates.md index 0fbb1010cf..1ae0dfee60 100644 --- a/data/reusables/sponsors/choose-updates.md +++ b/data/reusables/sponsors/choose-updates.md @@ -1,2 +1,2 @@ -4. Decide whether you want to receive email updates from the sponsored account, then select or unselect "Receive updates from _ACCOUNT_." +4. Decide whether you want to receive email updates from the sponsored account, then select or unselect "Receive email updates from _ACCOUNT_." ![Checkbox to receive updates from sponsored account](/assets/images/help/sponsors/updates-checkbox-manage.png) diff --git a/data/reusables/sponsors/click-add-tier.md b/data/reusables/sponsors/click-add-tier.md index 8bc0f4cff0..3704234aef 100644 --- a/data/reusables/sponsors/click-add-tier.md +++ b/data/reusables/sponsors/click-add-tier.md @@ -1,2 +1,2 @@ -1. On the bottom of the page, click **Add a tier**. +1. To create a monthly tier, click **Add a monthly tier** at the right of the page. Alternatively, to create a tier for one-time payments, click **One-time tiers** and then click **Add a one-time tier**. ![Add a tier button](/assets/images/help/sponsors/add-a-tier-button.png) diff --git a/data/reusables/sponsors/enable-custom-amounts.md b/data/reusables/sponsors/enable-custom-amounts.md new file mode 100644 index 0000000000..fd2a459a7c --- /dev/null +++ b/data/reusables/sponsors/enable-custom-amounts.md @@ -0,0 +1,4 @@ +1. When you have at least one tier, you'll see an option to enable custom amounts above the monthly and one-time tiers. If you want to allow sponsors to set their payment amount, then select **Enable custom amounts**. + ![Enable custom amounts](/assets/images/help/sponsors/enable-custom-amounts.png) +1. Optionally, if you enable custom amounts you can set a default amount to display for the custom tiers. Specify a whole dollar amount and click **Set default amount**. + ![Set a default amount](/assets/images/help/sponsors/set-default-amount.png) diff --git a/data/reusables/sponsors/feedback.md b/data/reusables/sponsors/feedback.md new file mode 100644 index 0000000000..44c1bb7d3f --- /dev/null +++ b/data/reusables/sponsors/feedback.md @@ -0,0 +1 @@ +You can share your feedback about {% data variables.product.prodname_sponsors %} with {% data variables.product.company_short %}. To join the conversation, see "[Sponsors Feedback](https://github.com/github/feedback/discussions/categories/sponsors-feedback)." diff --git a/data/reusables/sponsors/manage-updates-for-orgs.md b/data/reusables/sponsors/manage-updates-for-orgs.md index 0cd08d5382..b47ac0599d 100644 --- a/data/reusables/sponsors/manage-updates-for-orgs.md +++ b/data/reusables/sponsors/manage-updates-for-orgs.md @@ -1 +1 @@ -You can designate which email address receives updates from the accounts your organization sponsors. For more information, see "[Managing updates from accounts your organization sponsors](/github/setting-up-and-managing-organizations-and-teams/managing-updates-from-accounts-your-organization-sponsors)." +You can designate which email address receives updates from the accounts your organization sponsors. For more information, see "[Managing updates from accounts your organization sponsors](/organizations/managing-organization-settings/managing-updates-from-accounts-your-organization-sponsors)." diff --git a/data/reusables/sponsors/pay-prorated-amount.md b/data/reusables/sponsors/pay-prorated-amount.md index 969f672e64..b098d34abd 100644 --- a/data/reusables/sponsors/pay-prorated-amount.md +++ b/data/reusables/sponsors/pay-prorated-amount.md @@ -1,2 +1,2 @@ -1. Optionally, if you're sponsoring as an organization, to pay a prorated amount instead of making the full monthly payment, under "Due today", click **Pay prorated $X.XX today**. +1. Optionally, if you're sponsoring as an organization, to pay a prorated amount instead of making the full monthly payment, under "Total due now", click **Pay prorated $X.XX instead**. ![Link to pay prorated amount](/assets/images/help/sponsors/pay-prorated-amount-link.png) \ No newline at end of file diff --git a/data/reusables/sponsors/prorated-sponsorship.md b/data/reusables/sponsors/prorated-sponsorship.md index 56a047d867..9e560bf708 100644 --- a/data/reusables/sponsors/prorated-sponsorship.md +++ b/data/reusables/sponsors/prorated-sponsorship.md @@ -1 +1 @@ -If you're sponsoring on behalf of your user account, you will immediately be charged a prorated amount for the time until your next regular billing date. If you're sponsoring on behalf of an organization, you can choose to pay the prorated amount or make the full monthly payment. +If you're starting a monthly sponsorship on behalf of your user account, you'll immediately be charged a prorated amount for the time until your next regular billing date. If you're sponsoring on behalf of an organization, you can choose to pay the prorated amount or make the full monthly payment. diff --git a/data/reusables/sponsors/review-and-publish-tier.md b/data/reusables/sponsors/review-and-publish-tier.md index 7330af0fa3..e577304f71 100644 --- a/data/reusables/sponsors/review-and-publish-tier.md +++ b/data/reusables/sponsors/review-and-publish-tier.md @@ -1,2 +1,2 @@ -1. Proofread your tier, then click **Publish tier**. - ![Publish tier button](/assets/images/help/sponsors/publish-tier-button.png) +1. Proofread your tier, then click **Publish _TYPE_ tier**. + ![Publish monthly tier button](/assets/images/help/sponsors/publish-tier-button.png) diff --git a/data/reusables/sponsors/review-tiers-to-select.md b/data/reusables/sponsors/review-tiers-to-select.md new file mode 100644 index 0000000000..8dd4d85fa7 --- /dev/null +++ b/data/reusables/sponsors/review-tiers-to-select.md @@ -0,0 +1,2 @@ +1. On the right side of the page, under "Select a tier", review the sponsorship tiers available. If more than one type of tier is available "Monthly" tiers are shown, click **One-time** to show the tiers for one-time payments. + ![Show "One-time" tiers](/assets/images/help/sponsors/show-one-time-tiers.png) diff --git a/data/reusables/sponsors/select-a-tier.md b/data/reusables/sponsors/select-a-tier.md index 244113726f..8e87d104ba 100644 --- a/data/reusables/sponsors/select-a-tier.md +++ b/data/reusables/sponsors/select-a-tier.md @@ -1,2 +1,2 @@ -1. On the right side of the page, under "Select a tier", review the sponsorship tiers available. Then, to the right of the tier you want, click **Select**. +1. To the right of the tier you want, click **Select**. If want to select a custom amount, enter the sponsorship amount before clicking "Select." ![Select a tier box](/assets/images/help/sponsors/select-a-tier-box.png) diff --git a/data/reusables/sponsors/sponsorship-details.md b/data/reusables/sponsors/sponsorship-details.md index 6542580736..5f36b22238 100644 --- a/data/reusables/sponsors/sponsorship-details.md +++ b/data/reusables/sponsors/sponsorship-details.md @@ -1 +1 @@ -You can sponsor anyone with a sponsored developer profile or sponsored organization profile on behalf of your user account or an organization. You can choose from multiple sponsorship tiers, with monthly payment amounts and benefits that are set by the sponsored account. Your sponsorship will share your account's existing billing date, payment method, and receipt. +You can sponsor anyone with a sponsored developer profile or sponsored organization profile on behalf of your user account or an organization. You can choose from multiple sponsorship tiers, with one-time or monthly payment amounts and benefits that are set by the sponsored account. Your sponsorship will share your account's existing billing date, payment method, and receipt. diff --git a/data/reusables/sponsors/tier-details.md b/data/reusables/sponsors/tier-details.md index 9b80bb5aea..78c40c1054 100644 --- a/data/reusables/sponsors/tier-details.md +++ b/data/reusables/sponsors/tier-details.md @@ -1,3 +1,3 @@ -You can create up to ten sponsorship tiers for sponsors to choose from. Each tier has its own monthly payment amount in US dollars and benefits, such as receiving early access to new versions or being featured in the project's README. +You can create up to ten sponsorship tiers for sponsors to choose from. Each tier has its own monthly or one-time payment amount in US dollars and benefits, such as receiving early access to new versions or being featured in the project's README. In addition, you can choose to enable tiers for custom amounts (monthly and one-time). -Once you have published a tier, you can't edit the price of that tier. Instead, you must retire the tier and create a new tier. Existing sponsors will remain on the retired tier until they change their sponsorship tier or cancel their sponsorship. +Once you have published a tier, you can't edit the price of that tier. Instead, you must retire the tier and create a new tier. Existing sponsors will remain on the retired tier until they change their sponsorship tier, cancel their sponsorship, or their one-time sponsorship period expires. diff --git a/data/reusables/support/accessing-premium-content.md b/data/reusables/support/accessing-premium-content.md index 95aae9361d..36beb80ba8 100644 --- a/data/reusables/support/accessing-premium-content.md +++ b/data/reusables/support/accessing-premium-content.md @@ -1,4 +1,4 @@ ### Accessing premium content -You can access premium content by signing in to the {% data variables.contact.contact_enterprise_portal %}. +You can access premium content by signing in to the {% data variables.contact.contact_landing_page_portal %}. diff --git a/data/reusables/support/contacting-premium-support.md b/data/reusables/support/contacting-premium-support.md index c3e8440e39..5e11eb52c6 100644 --- a/data/reusables/support/contacting-premium-support.md +++ b/data/reusables/support/contacting-premium-support.md @@ -1,4 +1,4 @@ ### Contacting {% data variables.contact.premium_support %} -{% data variables.contact.premium_support %} customers can use the {% data variables.contact.contact_enterprise_portal %} to report issues in writing, in English. You can also receive English-language support over the phone. For the {% data variables.contact.premium_support %} phone number, see "[24x7 Phone Support](https://enterprise.githubsupport.com/hc/en-us/articles/360029707371-24x7-Phone-Support)" in the {% data variables.contact.enterprise_portal %}. +{% data variables.contact.premium_support %} customers can use the {% data variables.contact.contact_landing_page_portal %} to report issues in writing, in English. \ No newline at end of file diff --git a/data/reusables/user_settings/billing_plans.md b/data/reusables/user_settings/billing_plans.md new file mode 100644 index 0000000000..505b2eb273 --- /dev/null +++ b/data/reusables/user_settings/billing_plans.md @@ -0,0 +1,2 @@ +1. In your user settings sidebar, click **Billing & plans**. +![Billing & plans settings](/assets/images/help/settings/settings-sidebar-billing-plans.png) diff --git a/data/variables/contact.yml b/data/variables/contact.yml index 2b576108a8..e114b6d57f 100644 --- a/data/variables/contact.yml +++ b/data/variables/contact.yml @@ -36,10 +36,14 @@ contact_enterprise_portal: '[GitHub Enterprise Support portal](https://enterpris ae_azure_portal: 'Azure Support portal' contact_ae_portal: '[Azure Support portal](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade)' -# GitHub Support portal (for dotcom) +# GitHub Support portal (for dotcom - this sends users to a contact form) support_portal: 'GitHub Support portal' contact_support_portal: '[GitHub Support portal](https://support.github.com/contact)' +# GitHub Support portal (this sends users to the Support landing page) +landing_page_portal: 'GitHub Support portal' +contact_landing_page_portal: '[GitHub Support portal](https://support.github.com/)' + # The team that provides GitHub Community Support on the GitHub Community forum (for GitHub Free) community_support: 'GitHub Community Support' diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000000..d95ee9b205 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,7 @@ +version: '3.6' +services: + webapp: + build: + context: . + dockerfile: Dockerfile.openapi_decorator + image: 'openapi_decorator:${BUILD_SHA}' diff --git a/includes/explorer.html b/includes/explorer.html index f471ef3054..b431445670 100644 --- a/includes/explorer.html +++ b/includes/explorer.html @@ -1,7 +1,7 @@ {% include breadcrumbs %}
- {% if process.env.AIRGAP %} + {% if AIRGAP %}

GraphQL explorer is not available on this environment.

{% else %}