From fd74208af16b8ce94011dbaab7b7e102547d8823 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Wed, 30 Aug 2023 16:29:07 -0400
Subject: [PATCH] Move .editorconfig to repo root (#24398)

* Move .editorconfig to repo root

* Add yaml formatting to .editorconfig
---
 .../channels/.editorconfig => .editorconfig   | 13 +++++++--
 server/.editorconfig                          | 27 -------------------
 2 files changed, 11 insertions(+), 29 deletions(-)
 rename webapp/channels/.editorconfig => .editorconfig (72%)
 delete mode 100644 server/.editorconfig

diff --git a/webapp/channels/.editorconfig b/.editorconfig
similarity index 72%
rename from webapp/channels/.editorconfig
rename to .editorconfig
index b8b1577f854..0e4a261ebed 100644
--- a/webapp/channels/.editorconfig
+++ b/.editorconfig
@@ -8,7 +8,7 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 charset = utf-8
 
-[*.go]
+[*.{go,sql}]
 indent_style = tab
 
 [*.{js,jsx,json,html,ts,tsx}]
@@ -21,12 +21,21 @@ indent_size = 2
 [i18n/**.json]
 indent_size = 2
 
-[Makefile]
+[Makefile,*.mk]
 indent_style = tab
 
 [*.scss]
 indent_style = space
 indent_size = 4
 
+[*.md]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = false
+
 [.npm-upgrade.json]
 insert_final_newline = false
+
+[*.yml,*.yaml]
+indent_style = space
+indent_size = 2
diff --git a/server/.editorconfig b/server/.editorconfig
deleted file mode 100644
index d0d47befdd7..00000000000
--- a/server/.editorconfig
+++ /dev/null
@@ -1,27 +0,0 @@
-# http://editorconfig.org/
-
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-charset = utf-8
-trim_trailing_whitespace = true
-
-[*.{go,sql}]
-indent_style = tab
-
-[*.{js,jsx,json,html}]
-indent_style = space
-indent_size = 4
-
-[i18n/**.json]
-indent_size = 2
-
-[Makefile,*.mk]
-indent_style = tab
-
-[*.md]
-indent_style = space
-indent_size = 4
-trim_trailing_whitespace = false