nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7512 from SuperTux88/well-known

Browse source 
Cleanup .gitignore and add note about .well-known to the changelog
This commit is contained in:
Benjamin Neff 2017-08-04 03:03:45 +02:00
commit d0896c7823
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
.gitignore vendored
View file

@ -10,27 +10,15 @@ app/assets/images/custom/
# Configuration files # Configuration files
config/diaspora.yml config/diaspora.yml
config/heroku.yml
config/initializers/secret_token.rb config/initializers/secret_token.rb
config/redis.conf
config/deploy_config.yml
config/schedule.rb
.bundle .bundle
vendor/bundle/ vendor/bundle/
vendor/cache/ vendor/cache/
config/database.yml config/database.yml
.rvmrc_custom
.rvmrc.local
config/oidc_key.pem config/oidc_key.pem
# Mailing list stuff
config/email_offset
config/mailing_list.csv
# Generated files # Generated files
log/ log/
public/stylesheets/*.css
public/diaspora
spec/fixtures/*.y*ml spec/fixtures/*.y*ml
spec/fixtures/*.fixture.* spec/fixtures/*.fixture.*
coverage/ coverage/
@ -53,17 +41,13 @@ doc/
public/uploads/ public/uploads/
public/assets/ public/assets/
public/source.tar* public/source.tar*
public/.well-known
tmp/**/
tmp/ tmp/
*.sqlite3
# Temporary files of every sort # Temporary files of every sort
.sass-cache/ .sass-cache/
.DS_Store .DS_Store
.idea .idea
.redcar .redcar
.rvmrc
.stgit* .stgit*
*.swap *.swap
*.swo *.swo
@ -76,7 +60,6 @@ tmp/
nbproject nbproject
patches-* patches-*
capybara-*.html capybara-*.html
dump.rdb
# Rubinius's JIT # Rubinius's JIT
*.rbc *.rbc

6
Changelog.md
View file

@ -5,6 +5,11 @@
This release recommends using Ruby 2.4, while retaining Ruby 2.3 as an officially supported version. 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. 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 ## Refactor
* Make the mention syntax more flexible [#7305](https://github.com/diaspora/diaspora/pull/7305) * 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) * 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) * 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 ## Features
* Add support for mentions in comments to the backend [#6818](https://github.com/diaspora/diaspora/pull/6818) * Add support for mentions in comments to the backend [#6818](https://github.com/diaspora/diaspora/pull/6818)