这是indexloc提供的服务，不要输入任何密码
Skip to content

Patch confluence #1426

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 7 commits into from
May 16, 2024
Merged

Patch confluence #1426

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
95173c9
litellm LLM provider support
shatfield4 May 16, 2024
f065687
fix lint error
shatfield4 May 16, 2024
fc9e524
Merge branch 'master' into 1154-feat-integration-of-litellm-as-model-…
shatfield4 May 16, 2024
3e97806
Merge branch 'master' into 1154-feat-integration-of-litellm-as-model-…
timothycarambat May 16, 2024
7775ce9
change import orders
timothycarambat May 16, 2024
2ca14ac
patch confluence patterns
timothycarambat May 16, 2024
3b80afe
Merge branch 'master' into 1154-feat-integration-of-litellm-as-model-…
timothycarambat May 16, 2024
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
6 changes: 3 additions & 3 deletions collector/utils/extensions/Confluence/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const {
function validSpaceUrl(spaceUrl = "") {
// Atlassian default URL match
const atlassianPattern = new UrlPattern(
"https\\://(:subdomain).atlassian.net/wiki/spaces/(:spaceKey)/*"
"https\\://(:subdomain).atlassian.net/wiki/spaces/(:spaceKey)*"
);
const atlassianMatch = atlassianPattern.match(spaceUrl);
if (atlassianMatch) {
Expand All @@ -21,8 +21,8 @@ function validSpaceUrl(spaceUrl = "") {

let customMatch = null;
[
"https\\://(:subdomain.):domain.:tld/wiki/spaces/(:spaceKey)/*", // Custom Confluence space
"https\\://(:subdomain.):domain.:tld/display/(:spaceKey)/*", // Custom Confluence space + Human-readable space tag.
"https\\://(:subdomain.):domain.:tld/wiki/spaces/(:spaceKey)*", // Custom Confluence space
"https\\://(:subdomain.):domain.:tld/display/(:spaceKey)*", // Custom Confluence space + Human-readable space tag.
].forEach((matchPattern) => {
if (!!customMatch) return;
const pattern = new UrlPattern(matchPattern);
Expand Down