Thibaut Girka 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb

All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes.

2019-08-29 12:07:50 +02:00

..

_attachment_list.html.haml

Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)

2019-07-07 16:16:51 +02:00

_detailed_status.html.haml

Fix public page crash due to audio player, fix unpause in audio player (#11652)

2019-08-25 02:13:40 +02:00

_og_description.html.haml

Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)

2019-07-07 16:16:51 +02:00

_og_image.html.haml

Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)

2019-07-07 16:16:51 +02:00

_poll.html.haml

Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)

2019-07-07 16:16:51 +02:00

_simple_status.html.haml

Merge branch 'master' into glitch-soc/merge-upstream

2019-08-29 12:07:50 +02:00

_status.html.haml

Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)

2019-07-07 16:16:51 +02:00

embed.html.haml

Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)

2019-07-07 16:16:51 +02:00

show.html.haml

Prevent archiving when user set "noindex" (#11421)

2019-07-28 13:46:04 +02:00