Glitch-Shrike/app/models
Claire 443ec4f8ba Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/tags/index.html.haml`:
  Removed upstream while it had changes in glitch-soc to accomodate for the
  theming system.

Additional changes to accomodate for the theming system:
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`
- `app/views/admin/trends/links/index.html.haml`
- `app/views/admin/trends/tags/index.html.haml`
- `app/views/admin/tags/show.html.haml`
2021-11-25 23:50:35 +01:00
..
account_suggestions
admin Fix 404 error when filtering admin action logs by non-existent target account (#16643) 2021-10-14 20:53:11 +02:00
concerns Add remove from followers api (#16864) 2021-10-18 12:02:35 +02:00
form Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
trends Add trending links (#16917) 2021-11-25 13:07:38 +01:00
web
account.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-11-19 18:51:41 +01:00
account_alias.rb
account_conversation.rb
account_deletion_request.rb
account_domain_block.rb
account_filter.rb
account_identity_proof.rb
account_migration.rb
account_moderation_note.rb
account_note.rb Fix AccountNote not having a maximum length (#16942) 2021-11-06 00:12:25 +01:00
account_pin.rb
account_stat.rb Bump chewy from 5.2.0 to 7.2.3 (supports Elasticsearch 7.x) (#16915) 2021-11-18 22:02:08 +01:00
account_statuses_cleanup_policy.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
account_suggestions.rb
account_summary.rb
account_warning.rb
account_warning_preset.rb
admin.rb
announcement.rb
announcement_filter.rb
announcement_mute.rb
announcement_reaction.rb
application_record.rb
backup.rb
block.rb
bookmark.rb Bump chewy from 5.2.0 to 7.2.3 (supports Elasticsearch 7.x) (#16915) 2021-11-18 22:02:08 +01:00
canonical_email_block.rb Fix error when suspending user with an already-existing canonical email block (#17036) 2021-11-24 17:41:03 +01:00
context.rb
conversation.rb
conversation_mute.rb
custom_emoji.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-09-30 00:01:20 +02:00
custom_emoji_category.rb
custom_emoji_filter.rb
custom_filter.rb
device.rb
direct_feed.rb
domain_allow.rb
domain_block.rb
email_domain_block.rb
encrypted_message.rb
export.rb
favourite.rb Bump chewy from 5.2.0 to 7.2.3 (supports Elasticsearch 7.x) (#16915) 2021-11-18 22:02:08 +01:00
featured_tag.rb
feed.rb
follow.rb
follow_recommendation.rb
follow_recommendation_filter.rb
follow_recommendation_suppression.rb
follow_request.rb
home_feed.rb
identity.rb
import.rb
instance.rb
instance_filter.rb
invite.rb
invite_filter.rb
ip_block.rb
list.rb
list_account.rb
list_feed.rb
login_activity.rb Add authentication history (#16408) 2021-06-21 17:07:30 +02:00
marker.rb
media_attachment.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-10-13 15:50:24 +02:00
mention.rb
message_franking.rb
mute.rb
notification.rb
one_time_key.rb
poll.rb
poll_vote.rb
preview_card.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
preview_card_filter.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
preview_card_provider.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
preview_card_provider_filter.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
public_feed.rb
relationship_filter.rb
relay.rb
remote_follow.rb
report.rb
report_filter.rb Add ability to filter reports by origin of target account (#16487) 2021-07-11 11:01:38 +02:00
report_note.rb
rule.rb
scheduled_status.rb
search.rb
session_activation.rb
setting.rb
site_upload.rb
status.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-11-19 18:51:41 +01:00
status_pin.rb Add feature to automatically delete old toots (#16529) 2021-08-09 23:11:50 +02:00
status_stat.rb
system_key.rb
tag.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
tag_feed.rb
tag_filter.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
tombstone.rb
trends.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
unavailable_domain.rb
user.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-11-06 00:15:38 +01:00
user_invite_request.rb
web.rb
webauthn_credential.rb