Skip to content

Commit 171c0ea

Browse files
committed
Merge branch 'master' into 'release/2026.11.0'
update Nexus OSA documentation: add `Append block URL to custom message`,... See merge request CodeScoring/docs!635
2 parents 5c83c9f + 89b4c95 commit 171c0ea

42 files changed

Lines changed: 668 additions & 60 deletions

Some content is hidden

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

.gitlab-ci.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,13 @@ lint_markdown:
6262
GENERATED_ANCHORS=""
6363
COUNT=1
6464
while IFS= read -r heading; do
65-
lower=$(echo "$heading" | tr '[:upper:]' '[:lower:]')
65+
# Support explicit heading anchors like: ### Title {#custom-anchor}
66+
EXPLICIT_ANCHOR=$(echo "$heading" | grep -oP '\{#\K[^}]+' || true)
67+
[ -n "$EXPLICIT_ANCHOR" ] && GENERATED_ANCHORS="$GENERATED_ANCHORS\n$EXPLICIT_ANCHOR"
68+
69+
# Do not include markdown attrs in autogenerated slug
70+
HEADING_TEXT=$(echo "$heading" | sed -E 's/[[:space:]]*\{#[^}]+\}[[:space:]]*$//; s/[[:space:]]*\{[^}]*\}[[:space:]]*$//')
71+
lower=$(echo "$HEADING_TEXT" | tr '[:upper:]' '[:lower:]')
6672
safe=$(echo "$lower" | iconv -c -t ascii//TRANSLIT | sed 's/[^a-z0-9]/-/g; s/-\+/-/g; s/^-//; s/-$//')
6773
anchor=$([ -z "$safe" ] && echo "_$COUNT" || echo "$safe")
6874
COUNT=$((COUNT + 1))
@@ -107,7 +113,7 @@ lint_markdown:
107113
done
108114
109115
# URLs
110-
IGNORED_DOMAINS='bdu.fstec.ru|{osa-proxy-url}|artifactory.domain.ru|{REGISTRY_URL}/repository/helm|index.codescoring.ru|index-proxy:8000|webhook|atlassian|nuget|pypi|npmjs|maven|registry|mycompany|k8s|example|gitflic\.ru|localhost|127\.0\.0\.1|tip\.kaspersky\.com|JFROG_URL|host|jfrog\.my\.domain'
116+
IGNORED_DOMAINS='https://download.pytorch.org`|bdu.fstec.ru|{osa-proxy-url}|artifactory.domain.ru|{REGISTRY_URL}/repository/helm|index.codescoring.ru|index-proxy:8000|webhook|atlassian|nuget|pypi|npmjs|maven|registry|mycompany|k8s|example|gitflic\.ru|localhost|127\.0\.0\.1|tip\.kaspersky\.com|JFROG_URL|host|jfrog\.my\.domain'
111117
if command -v wget >/dev/null; then
112118
for file in $FILES; do
113119
URLS=$(grep -oP '(?:\[.*?\]\(\Khttp[s]?://[^\s)]+|(?<!\]\()http[s]?://[^\s>]+)' "$file" | sed 's/]\+$//' | grep -Ev "$IGNORED_DOMAINS" || true)
@@ -164,4 +170,4 @@ lint_markdown:
164170
else
165171
echo "🎉 All checks passed!"
166172
exit 0
167-
fi
173+
fi

docs/admin-guide.en.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
title: "Admin guide"
3+
hide:
4+
- toc
5+
---
6+
7+
# Admin guide
8+
9+
Select a documentation section:
10+
11+
<div class="guide-hub">
12+
<a class="guide-card" href="/on-premise/server-requirements.en/">
13+
<div class="guide-card__head">
14+
<span class="guide-card__title">Installation and maintenance</span>
15+
</div>
16+
<p class="guide-card__text">Installation requirements, deployment options, system maintenance, updates, and troubleshooting.</p>
17+
</a>
18+
19+
<a class="guide-card guide-card--general" href="/on-premise/how-to/activation.en/">
20+
<div class="guide-card__head">
21+
<span class="guide-card__title">Platform setup</span>
22+
</div>
23+
<p class="guide-card__text">System activation, access management, LDAP/OIDC configuration, and core administrative setup.</p>
24+
</a>
25+
</div>

docs/admin-guide.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
title: "Руководство администратора"
3+
hide:
4+
- toc
5+
---
6+
7+
# Руководство администратора
8+
9+
Выберите раздел документации:
10+
11+
<div class="guide-hub">
12+
<a class="guide-card" href="/on-premise/server-requirements/">
13+
<div class="guide-card__head">
14+
<span class="guide-card__title">Установка и эксплуатация</span>
15+
</div>
16+
<p class="guide-card__text">Требования к установке, варианты развертывания, обслуживание, обновление и диагностика.</p>
17+
</a>
18+
19+
<a class="guide-card guide-card--general" href="/on-premise/how-to/activation/">
20+
<div class="guide-card__head">
21+
<span class="guide-card__title">Настройка платформы</span>
22+
</div>
23+
<p class="guide-card__text">Активация системы, управление доступом, LDAP/OIDC и базовые административные настройки.</p>
24+
</a>
25+
</div>

docs/assets/icons/osa-dark.svg

Lines changed: 6 additions & 0 deletions
Loading

docs/assets/icons/sca-dark.svg

Lines changed: 6 additions & 0 deletions
Loading

docs/assets/icons/secrets-dark.svg

Lines changed: 6 additions & 0 deletions
Loading

docs/assets/icons/tqi-dark.svg

Lines changed: 7 additions & 0 deletions
Loading

docs/changelog/jfrog-changelog.en.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,18 @@ hide:
55

66
# JFrog plugin changelog
77

8+
### [2026.8.0] - 2026-02-20
9+
10+
#### Added
11+
12+
- Added support for Conda repositories
13+
- Added support for Conan repositories
14+
- Added support for Swift repositories
15+
16+
#### Changed
17+
18+
- Changed the application of policies depending on the type of repository to which the request was sent (virtual/remote): the actual repository name is now sent in the request to the platform
19+
820
### [2026.4.0] - 2026-01-20
921

1022
#### Fixed

0 commit comments

Comments
 (0)