Merge branch 'feat/add-bundles-to-gitattributes' into 'develop'

.gitattributes: Treat js/css/source maps as binary files

See merge request pleroma/pleroma!3153

diff --git a/.gitattributes b/.gitattributes
index c46415a5cc6ad2e81e1649359ad048700e6f4e55..68895bf883004acdbc4f8faa03ae727cd1cb45ae 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,8 @@
 *.ex diff=elixir
 *.exs diff=elixir
+# At the time of writing all js/css files included
+# in the repo are minified bundles, and we don't want
+# to search/diff those as text files.
+*.js binary
+*.js.map binary
+*.css binary