Mastodon

History

Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml

2019-07-19 18:26:49 +02:00

actions

Add option to disable real-time updates in web UI (#9984 )

2019-07-16 16:11:50 +02:00

components

Change single-column mode to scroll the whole page (#11359 )

2019-07-19 09:25:22 +02:00

containers

Change single-column mode to scroll the whole page (#11359 )

2019-07-19 09:25:22 +02:00

features

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