Skip to content

Commit fa50687

Browse files
authored
Merge branch 'main' into patch-2
2 parents 3eaa690 + bf941bc commit fa50687

File tree

78 files changed

+383
-381
lines changed

Some content is hidden

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

78 files changed

+383
-381
lines changed

.github/workflows/azure-preview-env-deploy.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,11 @@ jobs:
162162
rsync -rptovR ./user-code/content/./**/*.md ./content
163163
rsync -rptovR ./user-code/assets/./**/*.png ./assets
164164
rsync -rptovR ./user-code/data/./**/*.{yml,md} ./data
165+
rsync -rptovR ./user-code/components/./**/*.{ts,tsx} ./components
166+
rsync -rptovR ./user-code/lib/./**/*.{js,ts,json} ./lib
167+
rsync -rptovR ./user-code/middleware/./**/*.{js,ts} ./middleware
168+
rsync -rptovR ./user-code/pages/./**/*.{tsx} ./pages
169+
rsync -rptovR ./user-code/stylesheets/./**/*.{scss} ./stylesheets
165170
166171
# In addition to making the final image smaller, we also save time by not sending unnecessary files to the docker build context
167172
- name: 'Prune for preview env'

content/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,12 @@ You can manage the runner service in the Windows **Services** application, or yo
7878
```
7979
{% endmac %}
8080

81+
The command takes an optional `user` argument to install the service as a different user.
82+
83+
```shell
84+
./svc.sh install --user <em>USERNAME</em>
85+
```
86+
8187
## Starting the service
8288

8389
Start the service with the following command:

content/code-security/guides.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ includeGuides:
6767
- /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/listing-dependencies-configured-for-version-updates
6868
- /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-encrypted-secrets-for-dependabot
6969
- /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/managing-pull-requests-for-dependency-updates
70-
- /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot
7170
- /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies
7271
- /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-dependabot-security-updates
7372
- /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-managing-vulnerable-dependencies

content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/about-dependabot-version-updates.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ redirect_from:
77
- /github/administering-a-repository/about-github-dependabot-version-updates
88
- /github/administering-a-repository/about-dependabot-version-updates
99
- /code-security/supply-chain-security/about-dependabot-version-updates
10+
- /code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot
1011
versions:
1112
fpt: '*'
1213
ghec: '*'

content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ topics:
1515
- Pull requests
1616
children:
1717
- /about-dependabot-version-updates
18-
- /upgrading-from-dependabotcom-to-github-native-dependabot
1918
- /enabling-and-disabling-dependabot-version-updates
2019
- /listing-dependencies-configured-for-version-updates
2120
- /managing-pull-requests-for-dependency-updates

content/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/upgrading-from-dependabotcom-to-github-native-dependabot.md

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

content/repositories/creating-and-managing-repositories/duplicating-a-repository.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ Before you can push the original repository to your new copy, or _mirror_, of th
3535
```
3636
3. Mirror-push to the new repository.
3737
```shell
38-
$ cd <em>old-repository</em>
38+
$ cd <em>old-repository.git</em>
3939
$ git push --mirror https://{% data variables.command_line.codeblock %}/<em>exampleuser</em>/<em>new-repository</em>.git
4040
```
4141
4. Remove the temporary local repository you created earlier.
4242
```shell
4343
$ cd ..
44-
$ rm -rf <em>old-repository</em>
44+
$ rm -rf <em>old-repository.git</em>
4545
```
4646

4747
## Mirroring a repository that contains {% data variables.large_files.product_name_long %} objects
@@ -53,7 +53,7 @@ Before you can push the original repository to your new copy, or _mirror_, of th
5353
```
5454
3. Navigate to the repository you just cloned.
5555
```shell
56-
$ cd <em>old-repository</em>
56+
$ cd <em>old-repository.git</em>
5757
```
5858
4. Pull in the repository's {% data variables.large_files.product_name_long %} objects.
5959
```shell
@@ -70,7 +70,7 @@ Before you can push the original repository to your new copy, or _mirror_, of th
7070
7. Remove the temporary local repository you created earlier.
7171
```shell
7272
$ cd ..
73-
$ rm -rf <em>old-repository</em>
73+
$ rm -rf <em>old-repository.git</em>
7474
```
7575

7676
## Mirroring a repository in another location

content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Configuring tag protection rules
3-
shortTitle: Configure tag rules
3+
shortTitle: Tag protection rules
44
intro: You can configure tag protection rules for your repository to prevent contributors from creating or deleting tags.
55
product: '{% data reusables.gated-features.tag-protection-rules %}'
66
versions:

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

translations/log/pt-resets.csv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ translations/pt-BR/content/actions/hosting-your-own-runners/adding-self-hosted-r
55
translations/pt-BR/content/actions/hosting-your-own-runners/adding-self-hosted-runners.md,broken liquid tags
66
translations/pt-BR/content/actions/hosting-your-own-runners/monitoring-and-troubleshooting-self-hosted-runners.md,broken liquid tags
77
translations/pt-BR/content/actions/hosting-your-own-runners/using-self-hosted-runners-in-a-workflow.md,Listed in localization-support#489
8-
translations/pt-BR/content/admin/configuration/configuring-github-connect/managing-github-connect.md,broken liquid tags
98
translations/pt-BR/content/admin/configuration/configuring-your-enterprise/configuring-rate-limits.md,broken liquid tags
109
translations/pt-BR/content/admin/configuration/configuring-your-enterprise/site-admin-dashboard.md,broken liquid tags
1110
translations/pt-BR/content/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/increasing-cpu-or-memory-resources.md,broken liquid tags

0 commit comments

Comments
 (0)