mastodon/app/models
Thibaut Girka dc2ab6e646 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places.
2020-01-20 18:31:11 +01:00
..
admin Remove auto-silence behaviour from spam check (#12117) 2019-10-09 07:11:23 +02:00
concerns Fix file names being obfuscated on update when file didn't change (#12857) 2020-01-13 12:54:33 +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-12 15:57:34 +01:00
account_alias.rb
account_conversation.rb
account_domain_block.rb
account_filter.rb Fix search by IP not using alternative browser sessions in admin UI (#12904) 2020-01-20 17:00:41 +01:00
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
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 Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
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
domain_allow.rb
domain_block.rb Allow blocking TLDs, and fix TLD blocks not being editable (#12805) 2020-01-08 22:42:05 +01:00
email_domain_block.rb
export.rb
favourite.rb
featured_tag.rb
feed.rb
follow.rb
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 Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
invite.rb
invite_filter.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
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
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
relationship_filter.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
relay.rb
remote_follow.rb
report.rb
report_filter.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
report_note.rb
scheduled_status.rb
search.rb
session_activation.rb Update dependencies for Ruby (2018-04-23) (#7237) 2018-04-23 11:29:17 +02:00
setting.rb
site_upload.rb
status.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-01-12 15:57:34 +01:00
status_pin.rb
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 Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
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 Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01:00
user_invite_request.rb
web.rb