summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Hall <will@willhallonline.co.uk>2019-05-20 13:50:32 +0000
committerKamil TrzciƄski <ayufan@ayufan.eu>2019-05-20 13:50:32 +0000
commit23266cc64d221f85ff0ae8f8fc19edbb40ea3172 (patch)
tree7b479e17937780aa4c5f8ed442972d6a6e429ae6
parentc513434c9d7bdfa5e1c8bd3a86fe84df693faebd (diff)
downloadgitlab-ce-23266cc64d221f85ff0ae8f8fc19edbb40ea3172.tar.gz
#60818 Correct linting for project root *.yml files
-rw-r--r--.codeclimate.yml58
-rw-r--r--.haml-lint.yml2
-rw-r--r--.pkgr.yml4
-rw-r--r--changelogs/unreleased/60818_yamllint_project_root.yml5
4 files changed, 37 insertions, 32 deletions
diff --git a/.codeclimate.yml b/.codeclimate.yml
index 9998ddba643..2be8e63e842 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -6,35 +6,35 @@ engines:
enabled: true
config:
languages:
- - ruby
- - javascript
+ - ruby
+ - javascript
ratings:
paths:
- - Gemfile.lock
- - "**.erb"
- - "**.haml"
- - "**.rb"
- - "**.rhtml"
- - "**.slim"
- - "**.inc"
- - "**.js"
- - "**.jsx"
- - "**.module"
+ - Gemfile.lock
+ - "**.erb"
+ - "**.haml"
+ - "**.rb"
+ - "**.rhtml"
+ - "**.slim"
+ - "**.inc"
+ - "**.js"
+ - "**.jsx"
+ - "**.module"
exclude_paths:
-- config/
-- db/
-- features/
-- node_modules/
-- spec/
-- vendor/
-- .yarn-cache/
-- tmp/
-- builds/
-- coverage/
-- public/
-- shared/
-- webpack-report/
-- log/
-- backups/
-- coverage-javascript/
-- plugins/
+ - config/
+ - db/
+ - features/
+ - node_modules/
+ - spec/
+ - vendor/
+ - .yarn-cache/
+ - tmp/
+ - builds/
+ - coverage/
+ - public/
+ - shared/
+ - webpack-report/
+ - log/
+ - backups/
+ - coverage-javascript/
+ - plugins/
diff --git a/.haml-lint.yml b/.haml-lint.yml
index e9cc4a91a21..e356be30c45 100644
--- a/.haml-lint.yml
+++ b/.haml-lint.yml
@@ -153,7 +153,7 @@ linters:
Indentation:
enabled: true
- character: space # or tab
+ character: space # or tab
TagName:
enabled: true
diff --git a/.pkgr.yml b/.pkgr.yml
index 10bcd7bd4bd..2e741f41a9e 100644
--- a/.pkgr.yml
+++ b/.pkgr.yml
@@ -3,8 +3,8 @@ group: git
services:
- postgres
before_precompile: ./bin/pkgr_before_precompile.sh
-env:
- - SKIP_STORAGE_VALIDATION=true
+env:
+ - SKIP_STORAGE_VALIDATION=true
targets:
debian-7: &wheezy
build_dependencies:
diff --git a/changelogs/unreleased/60818_yamllint_project_root.yml b/changelogs/unreleased/60818_yamllint_project_root.yml
new file mode 100644
index 00000000000..b34a50e6a9c
--- /dev/null
+++ b/changelogs/unreleased/60818_yamllint_project_root.yml
@@ -0,0 +1,5 @@
+---
+title: Fix yaml linting for project root *.yml files
+merge_request: 27579
+author: Will Hall
+type: fixed