mastodon/app/models
Thibaut Girka 0437d70628 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
  Conflict due to upstream changing suspension logic while
  glitch-soc has an extra option to hide followers count.
  Ported upstream changes.
2020-11-08 14:20:35 +01:00
..
admin Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
concerns Add follower synchronization mechanism (#14510) 2020-10-21 18:04:09 +02:00
form Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
web Bump doorkeeper from 5.3.3 to 5.4.0 (#13733) 2020-05-12 15:25:33 +02:00
account.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
account_alias.rb Remove dependency on goldfinger gem (#14919) 2020-10-08 00:34:57 +02:00
account_conversation.rb allow pagination by min_id and max_id (#14776) 2020-09-12 17:09:49 +02:00
account_deletion_request.rb Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
account_domain_block.rb
account_filter.rb Add sorting by username, creation and last activity in moderation view (#13076) 2020-03-08 15:39:13 +01:00
account_identity_proof.rb
account_migration.rb Remove dependency on goldfinger gem (#14919) 2020-10-08 00:34:57 +02:00
account_moderation_note.rb
account_note.rb Add user notes on accounts (#14148) 2020-06-30 19:19:50 +02:00
account_pin.rb
account_stat.rb
account_tag_stat.rb
account_warning.rb Add account sensitized (#14361) 2020-11-04 20:45:01 +01:00
account_warning_preset.rb Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
admin.rb
announcement.rb Change order of announcements in admin page to sort them newest-first (#15091) 2020-11-04 21:15:22 +01:00
announcement_filter.rb
announcement_mute.rb
announcement_reaction.rb
application_record.rb
backup.rb
block.rb
bookmark.rb
context.rb
conversation.rb
conversation_mute.rb
custom_emoji.rb Add separate cache directory for non-local uploads (#12821) 2020-04-26 23:29:08 +02:00
custom_emoji_category.rb
custom_emoji_filter.rb
custom_filter.rb
device.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
direct_feed.rb
domain_allow.rb
domain_block.rb Fix admin page crashing when trying to block an invalid domain name (#13884) 2020-06-01 03:47:20 +02:00
email_domain_block.rb Add option to include resolved DNS records when blacklisting e-mail domains in admin UI (#13254) 2020-03-12 22:35:20 +01:00
encrypted_message.rb Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191) 2020-07-01 19:05:21 +02:00
export.rb
favourite.rb
featured_tag.rb
feed.rb allow pagination by min_id and max_id (#14776) 2020-09-12 17:09:49 +02:00
follow.rb Add follower synchronization mechanism (#14510) 2020-10-21 18:04:09 +02:00
follow_request.rb Add option to be notified when a followed user posts (#13546) 2020-09-18 17:26:45 +02:00
home_feed.rb Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191) 2020-07-01 19:05:21 +02:00
identity.rb
import.rb Fix csv upload (#13835) 2020-05-24 09:15:23 +02:00
instance.rb
instance_filter.rb
invite.rb Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
invite_filter.rb
ip_block.rb Add IP-based rules (#14963) 2020-10-12 16:33:49 +02:00
list.rb Add configuration option to filter replies in lists (#9205) 2020-09-01 13:31:28 +02:00
list_account.rb
list_feed.rb
marker.rb
media_attachment.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-08-30 16:13:08 +02:00
mention.rb
message_franking.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
mute.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
notification.rb Add option to be notified when a followed user posts (#13546) 2020-09-18 17:26:45 +02:00
one_time_key.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
poll.rb
poll_vote.rb
preview_card.rb Bump rubocop from 0.86.0 to 0.88.0 (#14412) 2020-09-01 03:04:00 +02:00
public_feed.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-09-08 16:26:47 +02:00
relationship_filter.rb Fix followings list order | Issue #13538 (#13676) 2020-05-08 20:17:16 +02:00
relay.rb Fix enable/disable relay failures (#13535) 2020-04-23 22:04:18 +02:00
remote_follow.rb Remove dependency on goldfinger gem (#14919) 2020-10-08 00:34:57 +02:00
report.rb Add rate limit for reporting (#13390) 2020-04-05 14:40:08 +02:00
report_filter.rb
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 2020-09-28 14:13:30 +02:00
status_pin.rb
status_stat.rb
system_key.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
tag.rb Changed tag most_used to recently_used (#14760) 2020-09-07 17:47:41 +02:00
tag_feed.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
tag_filter.rb
tombstone.rb
trending_tags.rb
unavailable_domain.rb Change delivery failure tracking to work with hostnames instead of URLs (#13437) 2020-04-15 20:33:24 +02:00
user.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
user_invite_request.rb
web.rb
webauthn_credential.rb Fix validates :sign_count of WebauthnCredential (#14806) 2020-09-16 20:16:46 +02:00