Skip to content

Commit a1d1514

Browse files
committed
Fully implement markdownlint-cli2 in project
1 parent 3a456e4 commit a1d1514

File tree

8 files changed

+173
-163
lines changed

8 files changed

+173
-163
lines changed

.markdownlint-cli2.yaml

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
---
2+
# Base Markdownlint configuration
3+
# Extended Markdownlint configuration in doc/.markdownlint/
4+
# See https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md for explanations of each rule
5+
config:
6+
# First, set the default
7+
default: true
8+
9+
# Per-rule settings in alphabetical order
10+
code-block-style: # MD046
11+
style: "fenced"
12+
emphasis-style: false # MD049
13+
first-header-h1: true # MD002
14+
first-line-h1: false # MD041
15+
header-style: # MD003
16+
style: "atx"
17+
hr-style: # MD035
18+
style: "---"
19+
line-length: false # MD013
20+
link-fragments: false # MD051
21+
no-duplicate-heading: # MD024
22+
siblings_only: true
23+
no-emphasis-as-heading: false # MD036
24+
no-inline-html: false # MD033
25+
no-trailing-punctuation: # MD026
26+
punctuation: ".,;:!。,;:!?"
27+
no-trailing-spaces: false # MD009
28+
ol-prefix: # MD029
29+
style: "one"
30+
reference-links-images: false # MD052
31+
ul-style: # MD004
32+
style: "dash"
33+
34+
# Keep this item last due to length
35+
proper-names: # MD044
36+
code_blocks: false
37+
html_elements: false
38+
names: [
39+
"Akismet",
40+
"Alertmanager",
41+
"AlmaLinux",
42+
"API",
43+
"Asana",
44+
"Auth0",
45+
"Azure",
46+
"Bamboo",
47+
"Bitbucket",
48+
"Bugzilla",
49+
"CAS",
50+
"CentOS",
51+
"Consul",
52+
"Debian",
53+
"DevOps",
54+
"Docker",
55+
"DockerSlim",
56+
"Elasticsearch",
57+
"Facebook",
58+
"fastlane",
59+
"fluent-plugin-redis-slowlog",
60+
"GDK",
61+
"Geo",
62+
"Git LFS",
63+
"git-annex",
64+
"git-credential-oauth",
65+
"git-sizer",
66+
"Git",
67+
"Gitaly",
68+
"GitHub",
69+
"gitlab.vim",
70+
"GitLab Geo",
71+
"GitLab Monitor",
72+
"GitLab Operator",
73+
"GitLab Pages",
74+
"GitLab Rails",
75+
"GitLab Runner",
76+
"GitLab Shell",
77+
"GitLab Workhorse",
78+
"GitLab",
79+
"Gitleaks",
80+
"Gmail",
81+
"Google",
82+
"Grafana",
83+
"Gzip",
84+
"Helm",
85+
"HipChat",
86+
"ID",
87+
"IP",
88+
"Ingress",
89+
"jasmine-jquery",
90+
"JavaScript",
91+
"Jaeger",
92+
"Jenkins",
93+
"Jira",
94+
"Jira Cloud",
95+
"Jira Server",
96+
"jQuery",
97+
"JSON",
98+
"JupyterHub",
99+
"Karma",
100+
"Kerberos",
101+
"Knative",
102+
"Kubernetes",
103+
"LDAP",
104+
"Let's Encrypt",
105+
"Markdown",
106+
"markdownlint",
107+
"Mattermost",
108+
"Microsoft",
109+
"minikube",
110+
"MinIO",
111+
"ModSecurity",
112+
"Neovim",
113+
"NGINX Ingress",
114+
"NGINX",
115+
"OAuth",
116+
"OAuth 2",
117+
"OmniAuth",
118+
"OpenID",
119+
"OpenShift",
120+
"PgBouncer",
121+
"Postfix",
122+
"PostgreSQL",
123+
"PowerShell",
124+
"Praefect",
125+
"Prometheus",
126+
"Puma",
127+
"puma-worker-killer",
128+
"Python",
129+
"Rake",
130+
"Redis",
131+
"Redmine",
132+
"reCAPTCHA",
133+
"Ruby",
134+
"runit",
135+
"Salesforce",
136+
"SAML",
137+
"Sendmail",
138+
"Sentry",
139+
"Service Desk",
140+
"Sidekiq",
141+
"Shibboleth",
142+
"Slack",
143+
"SMTP",
144+
"SpotBugs",
145+
"SSH",
146+
"Tiller",
147+
"TOML",
148+
"Trello",
149+
"Trello Power-Ups",
150+
"TypeScript",
151+
"Twitter",
152+
"Ubuntu",
153+
"Ultra Auth",
154+
"Unicorn",
155+
"unicorn-worker-killer",
156+
"URL",
157+
"WebdriverIO",
158+
"Workload Identity Pool",
159+
"Workload Identity Provider",
160+
"YAML",
161+
"YouTrack"
162+
]

.markdownlint.yml

Lines changed: 0 additions & 153 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
# Extended Markdown configuration to enforce no-trailing-spaces rule
3+
# To use this configuration, in the project directory run:
4+
# markdownlint-cli2 --config doc/.markdownlint/.markdownlint-cli2.yaml 'doc/**/*.md'
5+
config:
6+
extends: "../../.markdownlint-cli2.yaml"
7+
no-trailing-spaces: true

doc/.markdownlint/.markdownlint.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

doc/development/package_version_format.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ that do not contain changes to bundled components.
3030
|Release Type|Example Pipelines|`build_iteration` String|
3131
|-|-|-|
3232
|non-tagged|feature branches, nightly builds|`0`|
33-
|tagged|releases|`(ce|ee).<OMNIBUS_RELEASE>`|
33+
|tagged|releases|`ce.<OMNIBUS_RELEASE>` or `ee.<OMNIBUS_RELEASE>` |
3434

3535
The edition component, **ce** or **ee**, instructs package managers such as
3636
`apt` or `yum` to treat Enteprise Edition packages as an upgrade from

doc/settings/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@ The available options are:
801801
| `gitlab_rails['db_extra_config_command']` | Provides extra configuration to the DB configuration file used by GitLab Rails application. (`database.yml`) |
802802
| `gitlab_kas['extra_config_command']` | Provides extra configuration to GitLab agent server for Kubernetes (KAS). |
803803
| `gitlab_workhorse['extra_config_command']` | Provides extra configuration to GitLab Workhorse.|
804-
| `gitlab_exporter['extra_config_command']` | Provides extra configuration to GitLab Exporter.
804+
| `gitlab_exporter['extra_config_command']` | Provides extra configuration to GitLab Exporter. |
805805

806806
The value assigned to any of these options should be an absolute path to an executable script
807807
that writes the sensitive configuration in the required format to STDOUT. The

doc/settings/dns.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ The following GitLab settings correspond to DNS entries.
6767
| `external_url` | This URL interacts with the main GitLab instance. It's used when cloning over SSH/HTTP/HTTPS and when accessing the web UI. GitLab Runner uses this URL to communicate with the instance. | [Configure the `external_url`](configuration.md#configure-the-external-url-for-gitlab). |
6868
| `registry_external_url` | This URL is used to interact with the [Container Registry](https://docs.gitlab.com/ee/user/packages/container_registry/). It can be used by the Let's Encrypt integration. This URL can also use the same DNS entry as `external_url` but on a different port. | [Configure the `registry_external_url`](https://docs.gitlab.com/ee/administration/packages/container_registry.html#container-registry-domain-configuration). |
6969
| `mattermost_external_url` | This URL is used for the [bundled Mattermost](https://docs.gitlab.com/ee/integration/mattermost/) software. It can be used by the Let's Encrypt integration. | [Configure the `mattermost_external_url`](https://docs.gitlab.com/ee/integration/mattermost/#getting-started). |
70-
| `pages_external_url` | By default, projects that use [GitLab Pages](https://docs.gitlab.com/ee/user/project/pages/) deploy to a sub-domain of this value. | [Configure the `pages_external_url`](https://docs.gitlab.com/ee/administration/pages/#configuration).
70+
| `pages_external_url` | By default, projects that use [GitLab Pages](https://docs.gitlab.com/ee/user/project/pages/) deploy to a sub-domain of this value. | [Configure the `pages_external_url`](https://docs.gitlab.com/ee/administration/pages/#configuration). |
7171
| Auto DevOps domain | If you use Auto DevOps to deploy projects, this domain can be used to deploy software. It can be defined at an instance, or cluster level. This is configured using the GitLab UI, and not in `/etc/gitlab/gitlab.rb`. | [Configure the Auto DevOps domain](https://docs.gitlab.com/ee/topics/autodevops/requirements.html#auto-devops-base-domain). |
7272

7373
## Troubleshooting

gitlab-ci-config/gitlab-com.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ docs-lint markdown:
317317
# Lint prose
318318
- vale --minAlertLevel error doc
319319
# Lint Markdown
320-
- markdownlint-cli2-config .markdownlint.yml 'doc/**/*.md'
320+
- markdownlint-cli2 'doc/**/*.md'
321321
rules:
322322
- if: '$PIPELINE_TYPE =~ /_TEST_PIPELINE$/'
323323
- if: '$PIPELINE_TYPE =~ /_MR_PIPELINE$/'

0 commit comments

Comments
 (0)