Skip to content

Commit

Permalink
Merge pull request #319 from sous-chefs/automated/standardfiles
Browse files Browse the repository at this point in the history
Automated PR: Standardising Files
  • Loading branch information
ramereth committed Oct 8, 2020
2 parents f661d93 + 0d71b93 commit 1fcd4c1
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 10 deletions.
10 changes: 9 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
#https://EditorConfig.org
# https://EditorConfig.org

# top-most EditorConfig file
root=true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true

# 2 space indentation
indent_style = space
indent_size = 2

# Avoid issues parsing cookbook files later
charset = utf-8

# Avoid cookstyle warnings
trim_trailing_whitespace = true
19 changes: 10 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
*.rbc
.config
coverage
InstalledFiles
lib/bundler/man
pkg
rdoc
spec/reports
test/tmp
test/version_tmp
tmp
Expand All @@ -14,27 +10,32 @@ _Store
*#
.#*
\#*#
.*.sw[a-z]
*.un~
*.tmp
*.bk
*.bkup

# ruby/bundler files
# editor files
.idea
.*.sw[a-z]

# ruby/bundler/rspec files
.ruby-version
.ruby-gemset
.rvmrc
Gemfile.lock
.bundle
*.gem
coverage
spec/reports

# YARD artifacts
# YARD / rdoc artifacts
.yardoc
_yardoc
doc/
.idea
rdoc

# chef stuff
# chef infra stuff
Berksfile.lock
.kitchen
kitchen.local.yml
Expand Down
1 change: 1 addition & 0 deletions .yamllint
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ rules:
line-length:
max: 256
level: warning
document-start: disable

0 comments on commit 1fcd4c1

Please sign in to comment.