tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
b209e919bddb4bb72bb4f8589f4b15654f22ef53
Mastodon/app/models
History
Claire b3bf32a21e Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/reports/show.html.haml`:
  Conflicts due to glitch-soc's theming system.
2022-01-17 10:45:25 +01:00
..
account_suggestions
Change auto-following admin-selected accounts, show in recommendations (#16078)
2021-04-24 17:01:43 +02:00
admin
Add notifications for statuses deleted by moderators (#17204)
2022-01-17 09:41:33 +01:00
concerns
Add notifications for statuses deleted by moderators (#17204)
2022-01-17 09:41:33 +01:00
form
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-17 10:45:25 +01:00
trends
Change trending hashtags threshold back from 15 to 5 (#17122)
2021-12-13 05:32:29 +01:00
web
Add policy param to POST /api/v1/push/subscriptions (#16040)
2021-04-15 05:00:25 +02:00
account_alias.rb
…
account_conversation.rb
…
account_deletion_request.rb
…
account_domain_block.rb
…
account_filter.rb
Remove IP tracking columns from users table (#16409)
2022-01-16 13:23:50 +01:00
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
Change auto-following admin-selected accounts, show in recommendations (#16078)
2021-04-24 17:01:43 +02:00
account_summary.rb
Fix FollowRecommendationsScheduler failing because of unpopulated views (#16189)
2021-05-09 10:39:29 +02:00
account_warning_preset.rb
…
account_warning.rb
Add notifications for statuses deleted by moderators (#17204)
2022-01-17 09:41:33 +01:00
account.rb
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-16 18:11:20 +01:00
admin.rb
…
announcement_filter.rb
…
announcement_mute.rb
…
announcement_reaction.rb
…
announcement.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
Add ability for admins to delete canonical email blocks (#16644)
2021-12-17 23:02:14 +01:00
context.rb
…
conversation_mute.rb
…
conversation.rb
…
custom_emoji_category.rb
…
custom_emoji_filter.rb
…
custom_emoji.rb
Merge branch 'main' into glitch-soc/merge-upstream
2021-09-30 00:01:20 +02:00
custom_filter.rb
…
device.rb
…
direct_feed.rb
Fix DM timeline failing to load from database
2021-03-12 23:17:34 +01:00
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_recommendation_filter.rb
Add cold-start follow recommendations (#15945)
2021-04-12 12:37:14 +02:00
follow_recommendation_suppression.rb
Add cold-start follow recommendations (#15945)
2021-04-12 12:37:14 +02:00
follow_recommendation.rb
Fix FollowRecommendationsScheduler failing because of unpopulated views (#16189)
2021-05-09 10:39:29 +02:00
follow_request.rb
Fix edge case where accepted follow cannot be processed because of follow limit (#16098)
2021-04-23 22:51:21 +02:00
follow.rb
…
home_feed.rb
…
identity.rb
…
import.rb
…
instance_filter.rb
Add management of delivery availability in Federation settings (#15771)
2021-05-05 23:39:02 +02:00
instance.rb
Add management of delivery availability in Federation settings (#15771)
2021-05-05 23:39:02 +02:00
invite_filter.rb
…
invite.rb
…
ip_block.rb
…
list_account.rb
…
list_feed.rb
…
list.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
Prepare Mastodon for Rails 6 (#15911)
2021-03-17 10:09:55 +01:00
one_time_key.rb
…
poll_vote.rb
…
poll.rb
…
preview_card_filter.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
preview_card_provider.rb
Add trending links (#16917)
2021-11-25 13:07:38 +01:00
preview_card.rb
Fix error on trending hashtags/links pages in admin UI due to missing constant (#17044)
2021-11-26 01:12:39 +01:00
public_feed.rb
…
relationship_filter.rb
…
relay.rb
…
remote_follow.rb
…
report_filter.rb
Add notifications for statuses deleted by moderators (#17204)
2022-01-17 09:41:33 +01:00
report_note.rb
…
report.rb
Add notifications for statuses deleted by moderators (#17204)
2022-01-17 09:41:33 +01:00
rule.rb
Add server rules (#15769)
2021-02-21 19:50:12 +01:00
scheduled_status.rb
…
search.rb
…
session_activation.rb
Add Ruby 3.0 support (#16046)
2021-05-06 14:22:54 +02:00
setting.rb
…
site_upload.rb
…
status_pin.rb
Add feature to automatically delete old toots (#16529)
2021-08-09 23:11:50 +02:00
status_stat.rb
…
status.rb
Merge branch 'main' into glitch-soc/merge-upstream
2021-11-19 18:51:41 +01:00
system_key.rb
…
tag_feed.rb
…
tag_filter.rb
Add trending links (#16917)
2021-11-25 13:07:38 +01:00
tag.rb
Fix error on trending hashtags/links pages in admin UI due to missing constant (#17044)
2021-11-26 01:12:39 +01:00
tombstone.rb
…
trends.rb
Disable trending links review request emails
2021-11-25 23:55:05 +01:00
unavailable_domain.rb
…
user_invite_request.rb
…
user_ip.rb
Remove IP tracking columns from users table (#16409)
2022-01-16 13:23:50 +01:00
user.rb
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-16 18:11:20 +01:00
web.rb
…
webauthn_credential.rb
…