mastodon/app/models
Thibaut Girka 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/application_controller.rb`:
  Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
  Conflict due to theming system.
2020-01-04 23:04:42 +01:00
..
admin Remove auto-silence behaviour from spam check (#12117) 2019-10-09 07:11:23 +02:00
concerns Fix base64-encoded file uploads not being possible (#12748) 2020-01-04 01:54:07 +01:00
form Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
web
account.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00
account_alias.rb
account_conversation.rb
account_domain_block.rb
account_filter.rb
account_identity_proof.rb
account_migration.rb
account_moderation_note.rb
account_pin.rb
account_stat.rb
account_tag_stat.rb
account_warning.rb
account_warning_preset.rb Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
admin.rb
application_record.rb
backup.rb Increase max backup size (#12602) 2019-12-17 13:30:58 +01:00
block.rb
bookmark.rb Add bookmarks (#7107) 2019-11-13 23:02:10 +01:00
context.rb
conversation.rb
conversation_mute.rb
custom_emoji.rb
custom_emoji_category.rb
custom_emoji_filter.rb
custom_filter.rb
direct_feed.rb
domain_allow.rb
domain_block.rb
email_domain_block.rb
export.rb Export and import show_reblogs together with following list (#10495) 2019-04-08 07:28:27 +02:00
favourite.rb
featured_tag.rb
feed.rb
follow.rb Extract counters from accounts table to account_stats table (#9295) 2018-11-19 00:43:52 +01:00
follow_request.rb
home_feed.rb Fix performance of home feed regeneration (#12084) 2019-10-06 22:11:17 +02:00
identity.rb
import.rb
instance.rb
instance_filter.rb Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
invite.rb
invite_filter.rb
list.rb
list_account.rb Add abilityto add oneself to lists (#12271) 2019-11-04 13:02:01 +01:00
list_feed.rb
marker.rb
media_attachment.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00
mention.rb Improve support for aspects/circles (#8950) 2018-10-17 17:13:04 +02:00
mute.rb
notification.rb Add follow_request notification type (#12198) 2019-12-01 17:25:29 +01:00
poll.rb Only normalize local polls (#12515) 2019-12-01 17:24:33 +01:00
poll_vote.rb
preview_card.rb
relay.rb
remote_follow.rb
report.rb
report_filter.rb Add ability to filter reports by target account domain (#12154) 2019-11-30 19:53:58 +01:00
report_note.rb
scheduled_status.rb
search.rb
session_activation.rb
setting.rb
site_upload.rb
status.rb Add bookmarks (#7107) 2019-11-13 23:02:10 +01:00
status_pin.rb Update dependencies for Ruby (2018-04-23) (#7237) 2018-04-23 11:29:17 +02:00
status_stat.rb
tag.rb Fixes featured hashtag setting page erroring out instead of rejecting invalid tags (#12436) 2019-12-17 13:31:56 +01:00
tag_filter.rb
tombstone.rb
trending_tags.rb Fix admin setting to auto-approve hashtags not affecting query (#12130) 2019-10-10 02:22:04 +02:00
user.rb Do not consider moved accounts as non-functional 2019-11-27 17:37:01 +01:00
user_invite_request.rb Add "why do you want to join" field to invite requests (#10524) 2019-04-09 23:06:30 +09:00
web.rb