mastodon/app/models
Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
..
admin Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) 2019-09-11 16:32:44 +02:00
concerns Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
form Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
web Validate Web::PushSubscription (#11971) 2019-09-27 15:24:13 +02:00
account.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
account_alias.rb Addition of update activity distribution by alias, minor correction (#11905) 2019-09-21 09:11:21 +02:00
account_conversation.rb
account_domain_block.rb Fix crash when saving invalid domain name (#11528) 2019-08-08 23:04:19 +02:00
account_filter.rb Add moderation API (#9387) 2019-06-20 02:52:34 +02: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_pin.rb
account_stat.rb Add more accurate account search (#11537) 2019-08-16 01:24:03 +02:00
account_tag_stat.rb
account_warning.rb
account_warning_preset.rb
admin.rb
application_record.rb Change admin UI for hashtags and add back whitelisted trends (#11490) 2019-08-05 19:54:29 +02:00
backup.rb
block.rb
bookmark.rb
context.rb
conversation.rb Revert "Remove conversation URI (#11423)" (#11424) 2019-07-28 17:47:37 +02:00
conversation_mute.rb
custom_emoji.rb Fix audit log error when custom emoji is copied from remote server (#11876) 2019-09-17 23:20:48 +02:00
custom_emoji_category.rb Add batch actions and categories to admin UI for custom emojis (#11793) 2019-09-09 22:44:17 +02:00
custom_emoji_filter.rb Add batch actions and categories to admin UI for custom emojis (#11793) 2019-09-09 22:44:17 +02: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 Use a redis-cached feed for the DM timeline 2019-06-27 16:44:12 +02:00
domain_allow.rb Fix crash when saving invalid domain name (#11528) 2019-08-08 23:04:19 +02:00
domain_block.rb Add table of contents to about page (#11885) 2019-09-19 11:09:05 +02:00
email_domain_block.rb Fix crash when saving invalid domain name (#11528) 2019-08-08 23:04:19 +02:00
export.rb
favourite.rb
featured_tag.rb Fix featured tags not finding the right tag on save (#11504) 2019-08-07 10:00:58 +02:00
feed.rb Fix non-numbers being passed to Redis and causing an error (#11697) 2019-08-30 02:49:54 +02:00
follow.rb
follow_request.rb
home_feed.rb
identity.rb
import.rb
instance.rb Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
instance_filter.rb Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
invite.rb Add invite comments (#10465) 2019-08-19 11:40:42 +02:00
invite_filter.rb
list.rb
list_account.rb
list_feed.rb
marker.rb Add timeline read markers API (#11762) 2019-09-06 13:55:51 +02:00
media_attachment.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
mention.rb
mute.rb
notification.rb
poll.rb Add voters count support (#11917) 2019-09-29 22:58:01 +02:00
poll_vote.rb
preview_card.rb Fix preview card image not being re-fetched even if link is re-posted (#11981) 2019-09-28 01:33:16 +02:00
relay.rb Fix relays UI being available in whitelist/secure mode (#11963) 2019-09-27 02:13:34 +02:00
remote_follow.rb Add account migration UI (#11846) 2019-09-19 20:58:19 +02:00
report.rb Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) 2019-09-11 16:32:44 +02:00
report_filter.rb Add moderation API (#9387) 2019-06-20 02:52:34 +02: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 2019-09-30 12:23:57 +02:00
status_pin.rb
status_stat.rb
tag.rb Add exclude_unreviewed param to GET /api/v2/search REST API (#11977) 2019-09-28 01:02:21 +02:00
tag_filter.rb Add search and sort functions to hashtag admin UI (#11829) 2019-09-16 14:27:29 +02:00
tombstone.rb
trending_tags.rb Change half-life of trend decay (#11774) 2019-09-08 19:17:57 +02:00
user.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
user_invite_request.rb
web.rb