Skip to content

Commit 897b1dc

Browse files
authored
Merge pull request #1768 from EnterpriseDB/release/2021-08-18
2 parents ab34db4 + 2e1a86d commit 897b1dc

File tree

11 files changed

+28
-23
lines changed

11 files changed

+28
-23
lines changed

.husky/_/husky.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ if [ -z "$husky_skip_init" ]; then
2323

2424
if [ $exitCode != 0 ]; then
2525
echo "husky - $hook_name hook exited with code $exitCode (error)"
26-
exit $exitCode
2726
fi
2827

29-
exit 0
28+
exit $exitCode
3029
fi

.husky/post-checkout

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-checkout.\n"; exit 2; }
3+
git lfs post-checkout "$@"

.husky/post-commit

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-commit.\n"; exit 2; }
3+
git lfs post-commit "$@"

.husky/post-merge

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-merge.\n"; exit 2; }
3+
git lfs post-merge "$@"

.husky/pre-push

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/pre-push.\n"; exit 2; }
3+
git lfs pre-push "$@"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"fast-glob": "^3.2.5",
7373
"hast-util-is-element": "^1.1.0",
7474
"hast-util-to-text": "^2.0.1",
75-
"husky": "^6.0.0",
75+
"husky": "^7.0.0",
7676
"prettier": "^2.3.2",
7777
"pretty-quick": "^3.1.0",
7878
"react-refresh": "^0.10.0",

product_docs/docs/edbcloud/beta/getting_started/02_connect_cloud_account.mdx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ To connect your cloud account with your Azure subscription:
6262

6363
2. Fill in the following parameters in the form:
6464

65-
| Parameter | Description |
66-
| ------------------------------------- | ---------------------------------------------------------------------------- |
67-
| **Azure AD App ID** | Application (client) ID you noted when [creating your Azure AD Application](#create-azure-ad-application).|
68-
| **Azure AD App Secret** | Application (client) secret you noted when [creating your Azure AD Application](#create-azure-ad-application).|
69-
| **Azure Subscription ID** | Azure subscription ID for EDB Cloud available from the Subscriptions page of your Azure account. |
70-
| **Your EDB Cloud Organization Name** | SaaS Subscription Name you assigned as your EDB Cloud Organization (see [step 2. Fill out the details for your plan.](#2-fill-out-the-details-for-your-plan)) |
65+
| Parameter | Description |
66+
| ---------------------------------------------------- | ---------------------------------------------------------------------------- |
67+
| **Azure AD: Application Client ID** | Application client ID you noted when [creating your Azure AD Application](#create-azure-ad-application).|
68+
| **Azure AD: Application Client Secret Value Secret** | Application client secret value you noted when [creating your Azure AD Application](#create-azure-ad-application).|
69+
| **Azure Subscription ID** | Azure subscription ID for EDB Cloud available from the Subscriptions page of your Azure account. |
70+
| **Your EDB Cloud Organization Name** | SaaS Subscription Name you assigned as your EDB Cloud Organization (see [step 2. Fill out the details for your plan.](#2-fill-out-the-details-for-your-plan)) |
7171

7272
11. Select **Submit.**
7373

product_docs/docs/pem/8/pem_online_help/04_toc_pem_features/21_performance_diagnostic.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ You can use the Performance Diagnostic dashboard to analyze the database perform
99
Peformance Diagnostic feature is supported for Advanced Server databases from PEM 7.6 version onwards and for PostgreSQL databases it is supported from PEM 8.0 onwards.
1010

1111
!!! Note
12-
For PostgreSQL databases, Performance Diagnostics is supported only for versions 10, 11, 12, and 13 installed on the supported CentOS or RHEL platforms.
12+
For PostgreSQL databases, Performance Diagnostics is supported only for versions 10, 11, 12, and 13 installed on the supported platforms.
1313

1414
For more information on EDB Wait States, see [EDB Postgres Advanced Server Guide](/epas/latest/epas_guide/13_performance_analysis_and_tuning/).
1515

src/components/link.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ const stripPathPrefix = (path, pathPrefix) => {
2121
};
2222

2323
const stripMarkdownExtension = (path) => {
24-
return path.replace(/\.mdx?$/, "");
24+
return path.replace(/\.mdx?(?=$|\?|#)/, "");
2525
};
2626

2727
const isAbsoluteOrProtocolRelativeUrl = (url) => {
2828
return isAbsoluteUrl(url) || url.trim().startsWith("//");
2929
};
3030

3131
const hasNonMarkdownExtension = (url) => {
32-
return url.match(/\.[a-zA-Z]+$/) && !url.match(/\.mdx?$/);
32+
return url.match(/\.[a-zA-Z]+$/) && !url.match(/\.mdx?(?=$|\?|#)/);
3333
};
3434

3535
const rewriteUrl = (url, pageUrl, pageIsIndex, pathPrefix) => {

src/templates/doc.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,8 @@ const TileModes = {
127127
};
128128
const Tiles = ({ mode, node }) => {
129129
if (!node || !node.items) return null;
130-
if (mode === TileModes.None) return null;
131130

132-
if (!mode) {
133-
if (node.depth === 2) mode = TileModes.Full;
134-
else if (node.depth >= 3) mode = TileModes.Simple;
135-
}
136-
137-
if (Object.values(TileModes).includes(mode)) {
131+
if (Object.values(TileModes).includes(mode) && mode !== TileModes.None) {
138132
const tiles = node.items.map((n) => getCards(n, mode === "simple" ? 0 : 1));
139133

140134
return <CardDecks cards={tiles} cardType={mode} />;

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7920,10 +7920,10 @@ human-signals@^1.1.1:
79207920
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
79217921
integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
79227922

7923-
husky@^6.0.0:
7924-
version "6.0.0"
7925-
resolved "https://registry.yarnpkg.com/husky/-/husky-6.0.0.tgz#810f11869adf51604c32ea577edbc377d7f9319e"
7926-
integrity sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==
7923+
husky@^7.0.0:
7924+
version "7.0.1"
7925+
resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.1.tgz#579f4180b5da4520263e8713cc832942b48e1f1c"
7926+
integrity sha512-gceRaITVZ+cJH9sNHqx5tFwbzlLCVxtVZcusME8JYQ8Edy5mpGDOqD8QBCdMhpyo9a+JXddnujQ4rpY2Ff9SJA==
79277927

79287928
[email protected], iconv-lite@^0.4.24, iconv-lite@^0.4.4:
79297929
version "0.4.24"

0 commit comments

Comments
 (0)