Skip to content
Snippets Groups Projects
Commit 0d2fe2cb8826 authored by Evan Read's avatar Evan Read
Browse files

Use Ruby 3.2.1-based docs Docker images

Also refresh Markdownlint and Vale rules from GitLab project.
parent 6bf56c9eea9c
No related branches found
No related tags found
2 merge requests!102heptapod#1237: making 0.38 the new oldstable,!92Merging upstream 15.10.0+ce.0
......@@ -33,7 +33,6 @@
"API",
"Asana",
"Auth0",
"Authentiq",
"Azure",
"Bamboo",
"Bitbucket",
......@@ -109,6 +108,7 @@
"PgBouncer",
"Postfix",
"PostgreSQL",
"PowerShell",
"Praefect",
"Prometheus",
"Puma",
......
---
# Suggestion: gitlab.Admin
#
# Checks for "admin" and recommends using the full word instead. "Admin Area" is OK.
#
# For a list of all options, see https://vale.sh/docs/topics/styles/
extends: substitution
message: 'Verify this use of the word "admin". Can it be updated to "administration", "administrator", "administer", or "Admin Area"?'
link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html
level: suggestion
ignorecase: false
swap:
'[Aa]dmin ?\w*': '(?:Admin( Area| Mode)?|[Aa]dminist(ration|rator|rators|er|rative|ering|ered))'
......@@ -6,7 +6,7 @@
# For a list of all options, see https://vale.sh/docs/topics/styles/
extends: existence
message: "Refactor the section or page to avoid headings greater than H5."
link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#headings-in-markdown
link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#heading-levels-in-markdown
level: suggestion
scope: raw
raw:
......
---
# Suggestion: gitlab.SubstitutionSuggestions
#
# Suggests better options for frequently misused terms that are often - but not always - incorrect.
# SubstitutionWarning.yml and Substitutions.yml also exist.
#
# For a list of all options, see https://vale.sh/docs/topics/styles/
extends: substitution
message: 'Consider %s instead of "%s".'
link: https://docs.gitlab.com/ee/development/documentation/styleguide/word_list.html
level: suggestion
ignorecase: true
swap:
active user: '"billable user"'
active users: '"billable users"'
docs: '"documentation"'
e-mail: '"email"'
GLFM: '"GitLab Flavored Markdown"'
it is recommended: '"you should"'
we recommend: '"you should"'
navigate: go
OAuth2: '"OAuth 2.0"'
once that: '"after that"'
once the: '"after the"'
once you: '"after you"'
since: '"because" or "after"'
sub-group: '"subgroup"'
sub-groups: '"subgroups"'
within: '"in"'
......@@ -357,7 +357,6 @@
flamegraphs
Flawfinder
Flickr
Flowdock
Fluentd
Flutterwave
Flycheck
......@@ -498,6 +497,7 @@
Kinesis
Klar
Knative
KPIs
Kramdown
Kroki
kubeconfig
......@@ -618,6 +618,7 @@
NVMe
nyc
OAuth
OCP
Octokit
offboarded
offboarding
......@@ -626,6 +627,7 @@
OKRs
OKRs
Okta
OLM
OmniAuth
onboarding
OpenID
......@@ -669,6 +671,7 @@
Pipfiles
Piwik
plaintext
podman
Poedit
polyfill
polyfills
......@@ -836,4 +839,5 @@
SBOMs
sbt
SBT
scalar's
scalers
......@@ -839,5 +843,4 @@
scalers
scalar's
scatterplot
scatterplots
schedulable
......@@ -1185,6 +1188,7 @@
Zeitwerk
Zendesk
ZenTao
Zoekt
zsh
Zstandard
Zuora
......@@ -1188,4 +1192,3 @@
zsh
Zstandard
Zuora
Zoekt
......@@ -14,7 +14,7 @@
New installations starting from GitLab 7.6 have
all the options of the template listed in `/etc/gitlab/gitlab.rb` by default.
In `gitlab.yml`, you will find structure like this:
In `gitlab.yml`, you find structure like this:
```yaml
production: &base
......@@ -37,7 +37,7 @@
Run `sudo gitlab-ctl reconfigure` for changes in `gitlab.rb` to take effect.
Do not edit the generated file in `/var/opt/gitlab/gitlab-rails/etc/gitlab.yml`
since it will be overwritten on the next `gitlab-ctl reconfigure` run.
because it is overwritten on the next `gitlab-ctl reconfigure` run.
## Adding a new setting to `gitlab.yml`
......
......@@ -295,7 +295,7 @@
# Perform documentation linting on Markdown files
docs-lint markdown:
image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.16-vale-2.23.0-markdownlint-0.33.0-markdownlint2-0.6.0
image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.17-vale-2.24.0-markdownlint-0.33.0-markdownlint2-0.6.0
stage: check
cache: {}
needs: []
......@@ -312,7 +312,7 @@
# Perform link checks on published HTML files
docs-lint links:
image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.16-ruby-3.0.5-2a7e4d1c
image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.17-ruby-3.2.1-f53af000
stage: check
cache: {}
needs: []
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment