Thibaut Girka
|
bca3825c17
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2019-07-28 16:28:05 +02:00 |
|
Jeong Arm
|
6a1f08d29a
|
Prevent archiving when user set "noindex" (#11421)
|
2019-07-28 13:46:04 +02:00 |
|
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 |
|
Eugen Rochko
|
63c7fe8e48
|
Refactor controllers for statuses, accounts, and more (#11249)
|
2019-07-08 12:03:45 +02:00 |
|
Eugen Rochko
|
b851456139
|
Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)
|
2019-07-07 16:16:51 +02:00 |
|