Skip to content

Commit 335844e

Browse files
authored
Merge branch 'main' into workflow-boolean-input-example
2 parents 348ee93 + 73226cf commit 335844e

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ When you enable auto assignment, any time your team has been requested to review
3636

3737
When code owners are automatically requested for review, the team is still removed and replaced with individuals unless a branch protection rule is configured to require review from code owners. If such a branch protection rule is in place, the team request cannot be removed and so the individual request will appear in addition.
3838

39-
{% ifversion fpt %}
40-
To further enhance your team's collaboration abilities, you can upgrade to {% data variables.product.prodname_ghe_cloud %}, which includes features like protected branches and code owners on private repositories. {% data reusables.enterprise.link-to-ghec-trial %}
41-
{% endif %}
42-
4339
### Routing algorithms
4440

4541
Code review assignments automatically choose and assign reviewers based on one of two possible algorithms.

content/pages/getting-started-with-github-pages/about-github-pages.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,21 +92,21 @@ If you choose the `/docs` folder of any branch as your publishing source, {% dat
9292
## Limits on use of {% data variables.product.prodname_pages %}
9393

9494
{% ifversion fpt or ghec %}
95-
{% data variables.product.prodname_pages %} sites created after June 15, 2016 and using `github.io` domains are served over HTTPS. If you created your site before June 15, 2016, you can enable HTTPS support for traffic to your site. For more information, see "[Securing your {% data variables.product.prodname_pages %} with HTTPS](/articles/securing-your-github-pages-site-with-https)."
95+
{% data variables.product.prodname_pages %} sites created after June 15, 2016, and using `github.io` domains are served over HTTPS. If you created your site before June 15, 2016, you can enable HTTPS support for traffic to your site. For more information, see "[Securing your {% data variables.product.prodname_pages %} with HTTPS](/articles/securing-your-github-pages-site-with-https)."
9696

9797
### Prohibited uses
9898
{% endif %}
99-
{% data variables.product.prodname_pages %} is not intended for or allowed to be used as a free web hosting service to run your online business, e-commerce site, or any other website that is primarily directed at either facilitating commercial transactions or providing commercial software as a service (SaaS). {% data reusables.pages.no_sensitive_data_pages %}
99+
{% data variables.product.prodname_pages %} is not intended for or allowed to be used as a free web-hosting service to run your online business, e-commerce site, or any other website that is primarily directed at either facilitating commercial transactions or providing commercial software as a service (SaaS). {% data reusables.pages.no_sensitive_data_pages %}
100100

101-
In addition, your use of {% data variables.product.prodname_pages %} is subject to the [GitHub Terms of Service](/free-pro-team@latest/github/site-policy/github-terms-of-service/), including the restrictions on get rich quick schemes, sexually obscene content, and violent or threatening content or activity.
101+
In addition, your use of {% data variables.product.prodname_pages %} is subject to the [GitHub Terms of Service](/free-pro-team@latest/github/site-policy/github-terms-of-service/), including the restrictions on get-rich-quick schemes, sexually obscene content, and violent or threatening content or activity.
102102

103103
### Usage limits
104104
{% data variables.product.prodname_pages %} sites are subject to the following usage limits:
105105

106-
- {% data variables.product.prodname_pages %} source repositories have a recommended limit of 1GB.{% ifversion fpt or ghec %} For more information, see "[What is my disk quota?"](/articles/what-is-my-disk-quota/#file-and-repository-size-limitations){% endif %}
106+
- {% data variables.product.prodname_pages %} source repositories have a recommended limit of 1 GB.{% ifversion fpt or ghec %} For more information, see "[What is my disk quota?](/articles/what-is-my-disk-quota/#file-and-repository-size-limitations)"{% endif %}
107107
- Published {% data variables.product.prodname_pages %} sites may be no larger than 1 GB.
108108
{% ifversion fpt or ghec %}
109-
- {% data variables.product.prodname_pages %} sites have a *soft* bandwidth limit of 100GB per month.
109+
- {% data variables.product.prodname_pages %} sites have a *soft* bandwidth limit of 100 GB per month.
110110
- {% data variables.product.prodname_pages %} sites have a *soft* limit of 10 builds per hour.
111111

112112
If your site exceeds these usage quotas, we may not be able to serve your site, or you may receive a polite email from {% data variables.contact.contact_support %} suggesting strategies for reducing your site's impact on our servers, including putting a third-party content distribution network (CDN) in front of your site, making use of other {% data variables.product.prodname_dotcom %} features such as releases, or moving to a different hosting service that might better fit your needs.

content/rest/guides/basics-of-authentication.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ up your application. It's the callback URL that {% data variables.product.produc
3838
successful authentication.
3939

4040
Since we're running a regular Sinatra server, the location of the local instance
41-
is set to `http://localhost:4567`. Let's fill in the callback URL as `http://localhost:4567/callback`.
41+
is set to `http://127.0.0.1:4567`. Let's fill in the callback URL as `http://127.0.0.1:4567/callback`.
4242

4343
## Accepting user authorization
4444

@@ -91,7 +91,7 @@ Also, notice that the URL uses the `scope` query parameter to define the
9191
[scopes][oauth scopes] requested by the application. For our application, we're
9292
requesting `user:email` scope for reading private email addresses.
9393

94-
Navigate your browser to `http://localhost:4567`. After clicking on the link, you
94+
Navigate your browser to `http://127.0.0.1:4567`. After clicking on the link, you
9595
should be taken to {% data variables.product.product_name %}, and presented with a dialog that looks something like this:
9696
![GitHub's OAuth Prompt](/assets/images/oauth_prompt.png)
9797

@@ -215,7 +215,7 @@ We can do whatever we want with our results. In this case, we'll just dump them
215215

216216
It'd be a pretty bad model if we required users to log into the app every single
217217
time they needed to access the web page. For example, try navigating directly to
218-
`http://localhost:4567/basic`. You'll get an error.
218+
`http://127.0.0.1:4567/basic`. You'll get an error.
219219

220220
What if we could circumvent the entire
221221
"click here" process, and just _remember_ that, as long as the user's logged into
@@ -348,7 +348,7 @@ Next, create a file in _views_ called _advanced.erb_, and paste this markup into
348348

349349
From the command line, call `ruby advanced_server.rb`, which starts up your
350350
server on port `4567` -- the same port we used when we had a simple Sinatra app.
351-
When you navigate to `http://localhost:4567`, the app calls `authenticate!`
351+
When you navigate to `http://127.0.0.1:4567`, the app calls `authenticate!`
352352
which redirects you to `/callback`. `/callback` then sends us back to `/`,
353353
and since we've been authenticated, renders _advanced.erb_.
354354

0 commit comments

Comments
 (0)