]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Thu, 29 Aug 2019 10:07:50 +0000 (12:07 +0200)
committerThibaut Girka <thib@sitedethib.com>
Thu, 29 Aug 2019 10:07:50 +0000 (12:07 +0200)
commit48b8a1f414e3d8430bd797e3db298fc5355ace2d
treec7b84ed81fb99b51eb2596df8ac1663d1998fa89
parent79725f659d5e9c449df0ff73f9363407a0a064bd
parent4500dc2385d8571c494ea0277fe4ca415a264404
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.
16 files changed:
Gemfile
Gemfile.lock
app/controllers/api/v1/statuses_controller.rb
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/styles/mastodon/components.scss
app/models/status.rb
app/services/batched_remove_status_service.rb
app/services/remove_status_service.rb
app/views/admin/dashboard/index.html.haml
app/views/statuses/_simple_status.html.haml
config/locales/en.yml
config/locales/simple_form.en.yml
db/schema.rb
package.json
yarn.lock