mastodon/app/models
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
..
admin Fix option to send e-mail notification about account action always being true (#11242) 2019-07-06 13:54:32 +02:00
concerns Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
form Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
web
account.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
account_conversation.rb
account_domain_block.rb
account_filter.rb Add moderation API (#9387) 2019-06-20 02:52:34 +02:00
account_identity_proof.rb
account_moderation_note.rb
account_pin.rb
account_stat.rb
account_tag_stat.rb
account_warning.rb
account_warning_preset.rb
admin.rb
application_record.rb
backup.rb
block.rb
bookmark.rb
context.rb
conversation.rb
conversation_mute.rb
custom_emoji.rb Add categories for custom emojis (#11196) 2019-06-28 15:54:10 +02:00
custom_emoji_category.rb Add categories for custom emojis (#11196) 2019-06-28 15:54:10 +02:00
custom_emoji_filter.rb
custom_filter.rb Fix expiration date of filters being set to “Never” when editing them (#11204) 2019-06-30 16:11:21 +02:00
direct_feed.rb Use a redis-cached feed for the DM timeline 2019-06-27 16:44:12 +02:00
domain_block.rb Change domain blocks to automatically support subdomains (#11138) 2019-06-22 00:13:10 +02:00
email_domain_block.rb
export.rb
favourite.rb
featured_tag.rb
feed.rb
follow.rb
follow_request.rb
home_feed.rb
identity.rb
import.rb
instance.rb Remove expensive counters from federation page in admin UI (#11139) 2019-06-22 00:39:09 +02:00
instance_filter.rb
invite.rb
invite_filter.rb
list.rb
list_account.rb
list_feed.rb
media_attachment.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
mention.rb
mute.rb
notification.rb
poll.rb
poll_vote.rb
preview_card.rb
relay.rb
remote_follow.rb
report.rb Add moderation API (#9387) 2019-06-20 02:52:34 +02:00
report_filter.rb Add moderation API (#9387) 2019-06-20 02:52:34 +02:00
report_note.rb
scheduled_status.rb
search.rb
session_activation.rb
setting.rb
site_upload.rb
status.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
status_pin.rb
status_stat.rb
subscription.rb
tag.rb Fix only one middle dot being recognized in hashtags (#11345) 2019-07-18 03:02:56 +02:00
tombstone.rb
trending_tags.rb
user.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
user_invite_request.rb
web.rb