From c6a0fbe8d490480f20d6c4978d98be9348d1cc4e Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Fri, 4 Aug 2017 00:31:12 +0200
Subject: [PATCH] Cleanup .gitignore and add note about .well-known to the
 changelog

[ci skip]
---
 .gitignore   | 17 -----------------
 Changelog.md |  5 +++++
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 072691512..74399f663 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,27 +10,15 @@ app/assets/images/custom/
 
 # Configuration files
 config/diaspora.yml
-config/heroku.yml
 config/initializers/secret_token.rb
-config/redis.conf
-config/deploy_config.yml
-config/schedule.rb
 .bundle
 vendor/bundle/
 vendor/cache/
 config/database.yml
-.rvmrc_custom
-.rvmrc.local
 config/oidc_key.pem
 
-# Mailing list stuff
-config/email_offset
-config/mailing_list.csv
-
 # Generated files
 log/
-public/stylesheets/*.css
-public/diaspora
 spec/fixtures/*.y*ml
 spec/fixtures/*.fixture.*
 coverage/
@@ -53,17 +41,13 @@ doc/
 public/uploads/
 public/assets/
 public/source.tar*
-public/.well-known
-tmp/**/
 tmp/
-*.sqlite3
 
 # Temporary files of every sort
 .sass-cache/
 .DS_Store
 .idea
 .redcar
-.rvmrc
 .stgit*
 *.swap
 *.swo
@@ -76,7 +60,6 @@ tmp/
 nbproject
 patches-*
 capybara-*.html
-dump.rdb
 
 # Rubinius's JIT
 *.rbc
diff --git a/Changelog.md b/Changelog.md
index f6cf6f540..1c5204972 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,11 @@
 This release recommends using Ruby 2.4, while retaining Ruby 2.3 as an officially supported version.
 Ruby 2.1 is no longer officially supported.
 
+## Delete public/.well-known/
+
+Before upgrading, please check if your `public/` folder contains a hidden `.well-known/` folder.
+If so, please delete it since it will prevent the federation from working properly.
+
 ## Refactor
 
 * Make the mention syntax more flexible [#7305](https://github.com/diaspora/diaspora/pull/7305)