Cleanup .gitignore and add note about .well-known to the changelog
[ci skip]
This commit is contained in:
parent
61afb35803
commit
c6a0fbe8d4
2 changed files with 5 additions and 17 deletions
17
.gitignore
vendored
17
.gitignore
vendored
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue