Merge pull request #7512 from SuperTux88/well-known (d0896c78) · Commits · Gigadoc 2 / diaspora

.gitignore

+0 −17

Original line number	Diff line number	Diff line
		@@ -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/.yml
		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

+6 −0

Original line number	Diff line number	Diff line
		@@ -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)
		@@ -23,6 +28,7 @@ Ruby 2.1 is no longer officially supported.

		* Fix height too high on mobile SPV [#7480](https://github.com/diaspora/diaspora/pull/7480)
		* Improve stream when ignoring a person who posts a lot of tagged posts [#7503](https://github.com/diaspora/diaspora/pull/7503)
		* Fix order of comments across pods [#7436](https://github.com/diaspora/diaspora/pull/7436)

		## Features
		* Add support for mentions in comments to the backend [#6818](https://github.com/diaspora/diaspora/pull/6818)