From 7dbb77e57bca732886e9ae9b1c6406a19c53e29d Mon Sep 17 00:00:00 2001
From: Daniel Quinn <code@danielquinn.org>
Date: Sat, 1 Dec 2018 16:56:58 +0000
Subject: [PATCH] Add a .editorconfig

---
 .editorconfig      | 25 +++++++++++++++++++++++++
 docs/changelog.rst |  7 +++++++
 2 files changed, 32 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..469d18cfa
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,25 @@
+# EditorConfig: http://EditorConfig.org
+
+root = true
+
+[*]
+indent_style = tab
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+end_of_line = lf
+charset = utf-8
+max_line_length = 79
+
+[{*.html,*.css,*.js}]
+max_line_length = off
+
+[*.py]
+indent_size = 4
+indent_style = space
+
+# Tests don't get a line width restriction.  It's still a good idea to follow
+# the 79 character rule, but in the interests of clarity, tests often need to
+# violate it.
+[**/test_*.py]
+max_line_length = off
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 21cfa9339..504fadb2c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -13,6 +13,11 @@ Changelog
   requests.
 * Fix text in sample data for tests so that the language guesser stops thinking
   that everything is in Catalan because we had *Lorem ipsum* in there.
+* Tweaked the gunicorn sample command to use filesystem paths instead of Python
+  paths. `#441`_
+* Added pretty colour boxes next to the hex values in the Tags section, thanks
+  to a pull request from `Joshua Taillon`_ `#442`_.
+* Added a ``.editorconfig`` file to better specify coding style.
 
 
 2.5.0
@@ -684,6 +689,8 @@ bulk of the work on this big change.
 .. _#414: https://github.com/danielquinn/paperless/issues/414
 .. _#423: https://github.com/danielquinn/paperless/issues/423
 .. _#433: https://github.com/danielquinn/paperless/issues/433
+.. _#441: https://github.com/danielquinn/paperless/pull/441
+.. _#442: https://github.com/danielquinn/paperless/pull/442
 
 .. _pipenv: https://docs.pipenv.org/
 .. _a new home on Docker Hub: https://hub.docker.com/r/danielquinn/paperless/