This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/models
Thibaut Girka 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Upstream change too close to a glitch-soc change related to
  instance-local toots. Merged upstream changes.
- `app/services/fan_out_on_write_service.rb`:
  Minor conflict due to glitch-soc's handling of Direct Messages,
  merged upstream changes.
- `yarn.lock`:
  Not really a conflict, caused by glitch-soc-only dependencies
  being textually too close to updated upstream dependencies.
  Merged upstream changes.
2020-08-30 16:13:08 +02:00
..
admin Add ability to filter audit log in admin UI (#13381) 2020-04-03 13:06:34 +02:00
concerns Fix movie width and frame_rate returning nil (#14357) 2020-07-19 22:28:27 +02:00
form Merge branch 'master' into glitch-soc/master 2020-08-11 19:19:27 +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-06-09 10:39:20 +02:00
account_alias.rb Fix confusing error when failing to add an alias to an unknown account (#13480) 2020-04-15 20:33:53 +02:00
account_conversation.rb Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191) 2020-07-01 19:05:21 +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 Add (back) option to set redirect notice on account without moving followers (#11994) 2019-09-29 05:03:19 +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 Fix account counters being overwritten by parallel writes (#12045) 2019-10-02 04:59:37 +02:00
account_tag_stat.rb
account_warning.rb
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 delivery failure tracking to work with hostnames instead of URLs (#13437) 2020-04-15 20:33:24 +02:00
announcement_filter.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
announcement_mute.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
announcement_reaction.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
application_record.rb Fix records not being indexed sometimes (#12024) 2019-10-01 01:19:11 +02:00
backup.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
block.rb
bookmark.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
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 Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
custom_filter.rb Add “account timeline” filter category (#12918) 2020-01-23 21:32:00 +01:00
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 Fix records not being indexed sometimes (#12024) 2019-10-01 01:19:11 +02:00
featured_tag.rb
feed.rb
follow.rb Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
follow_request.rb Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01: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 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-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
notification.rb Add follow_request notification type (#12198) 2019-12-01 17:25:29 +01:00
one_time_key.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
poll.rb Only normalize local polls (#12515) 2019-12-01 17:24:33 +01:00
poll_vote.rb
preview_card.rb Add blurhash to preview cards (#13984) 2020-06-05 23:10:41 +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 Refactor monkey-patching of Goldfinger (#12561) 2020-05-10 11:41:43 +02:00
report.rb Add rate limit for reporting (#13390) 2020-04-05 14:40:08 +02:00
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
setting.rb
site_upload.rb
status.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-05-28 13:44:57 +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 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
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-08-30 16:13:08 +02:00
user_invite_request.rb
web.rb
webauthn_credential.rb Add WebAuthn as an alternative 2FA method (#14466) 2020-08-24 16:46:27 +02:00