Skip to content

[pull] main from github:main #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 26 commits into from
Apr 21, 2021
Merged

[pull] main from github:main #42

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
c29b157
updating contribution.md under docs in github
yashhd Apr 19, 2021
11d43c1
Update CONTRIBUTING.md
yashhd Apr 19, 2021
bd05f78
Update CONTRIBUTING.md
yashhd Apr 19, 2021
b9f2334
Update CONTRIBUTING.md
yashhd Apr 19, 2021
15be8fb
updating CONTRIBUTING.md
yashhd Apr 19, 2021
8cef45c
Update product call out to bg-success (#18885)
heiskr Apr 20, 2021
037efbf
Merge branch 'main' into repo-sync
Octomerger Apr 20, 2021
ceffeb6
Merge pull request #18894 from github/repo-sync
Octomerger Apr 20, 2021
139018d
Add Adobe secret scanning token types (#18871)
Apr 20, 2021
1215c9d
Merge pull request #5577 from github/repo-sync
Octomerger Apr 20, 2021
31bc6d1
Merge branch 'main' into main
janiceilene Apr 20, 2021
d555ea2
Merge pull request #5508 from yashhd/main
janiceilene Apr 20, 2021
dfd42d3
Merge pull request #18898 from github/repo-sync
Octomerger Apr 20, 2021
0d9b634
Clarify how GHES can use GH Connect for updated actions (#18857)
Apr 21, 2021
c34b374
Merge pull request #5582 from github/repo-sync
Octomerger Apr 21, 2021
8054606
Webhook restructuring follow-up (#18872)
rachmari Apr 21, 2021
3a22481
Merge branch 'main' into repo-sync
Octomerger Apr 21, 2021
f949d58
Merge pull request #5585 from github/repo-sync
Octomerger Apr 21, 2021
6c288b8
Merge branch 'main' into repo-sync
Octomerger Apr 21, 2021
ee882de
Merge pull request #18901 from github/repo-sync
Octomerger Apr 21, 2021
0c36506
Update GitHub token types we scan for (#18897)
Apr 21, 2021
cd54784
Merge branch 'main' into repo-sync
Octomerger Apr 21, 2021
8cd1df5
Merge pull request #18905 from github/repo-sync
Octomerger Apr 21, 2021
fb4d164
Merge pull request #5592 from github/repo-sync
Octomerger Apr 21, 2021
9d13602
Import missing avatar style (#18895)
heiskr Apr 21, 2021
d799729
Merge pull request #5595 from github/repo-sync
Octomerger Apr 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions data/reusables/secret-scanning/partner-secret-list-private-repo.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ Partner | Supported secret | API slug
n/a | JSON Web Token | json_web_token
n/a | OAuth Client Credential | api_credential_assignment
Adafruit IO | Adafruit IO Key | adafruit_io_key
Adobe | Adobe Device Token | adobe_device_token
Adobe | Adobe Service Token | adobe_service_token
Adobe | Adobe Short-Lived Access Token | adobe_short_lived_access_token
Adobe | Adobe JSON Web Token | adobe_jwt
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
Expand Down
14 changes: 9 additions & 5 deletions data/reusables/secret-scanning/partner-secret-list-public-repo.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
Partner | Supported secret
--- | ---
Adafruit IO | Adafruit IO Key
Adobe | Adobe Device Token
Adobe | Adobe Service Token
Adobe | Adobe Short-Lived Access Token
Adobe | Adobe JSON Web Token
Alibaba Cloud | Alibaba Cloud Access Key ID and Access Key Secret pair
Amazon Web Services (AWS) | Amazon AWS Access Key ID and Secret Access Key pair
Atlassian | Atlassian API Token
Atlassian | Atlassian JSON Web Token
Azure | Azure DevOps Personal Access Token | azure_devops_personal_access_token
Azure | Azure SAS Token | azure_sas_token
Azure | Azure Service Management Certificate | azure_management_certificate
Azure | Azure SQL Connection String | azure_sql_connection_string
Azure | Azure Storage Account Key | azure_storage_account_key
Azure | Azure DevOps Personal Access Token
Azure | Azure SAS Token
Azure | Azure Service Management Certificate
Azure | Azure SQL Connection String
Azure | Azure Storage Account Key
Clojars | Clojars Deploy Token
CloudBees CodeShip | CloudBees CodeShip Credential
Databricks | Databricks Access Token
Expand Down
2 changes: 1 addition & 1 deletion includes/article.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h1 class="border-bottom-0">{{ page.title }}</h1>
{% endif %}

{% if page.product %}
<div class="product-callout border rounded-1 mb-4 p-3 color-border-info color-bg-info">
<div class="product-callout border rounded-1 mb-4 p-3 color-border-success color-bg-success">
{{ page.product }}
</div>
{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions tests/rendering/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ describe('server', () => {
test('renders product frontmatter callouts', async () => {
const $ = await getDOM('/en/articles/about-branch-restrictions')
const note = $('.product-callout').eq(0)
expect(note.hasClass('color-border-info')).toBe(true)
expect(note.hasClass('color-bg-info')).toBe(true)
expect(note.hasClass('color-border-success')).toBe(true)
expect(note.hasClass('color-bg-success')).toBe(true)
})

test('renders liquid within liquid within product frontmatter callouts', async () => {
Expand Down