mastodon/app/models
Thibaut Girka 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
  Conflict because we changed the number of default results to be
  configurable
- app/lib/settings/scoped_settings.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
2019-09-13 18:13:43 +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-13 18:13:43 +02:00
form Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
web
…
account.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +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_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 Change unlisted custom emoji to not appear in autosuggestions (#11818) 2019-09-13 16:01:09 +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 public blocks to /about/blocks (#11298) 2019-08-19 11:35:48 +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
…
poll_vote.rb
…
preview_card.rb Change tootctl to use inline parallelization instead of Sidekiq (#11776) 2019-09-10 13:48:48 +02:00
relay.rb
…
remote_follow.rb Fix uncaught domain normalization error in remote follow (#11703) 2019-08-30 02:19:17 +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-13 18:13:43 +02:00
status_pin.rb
…
status_stat.rb
…
tag.rb Fix hashtags being split by ZWNJ character (#11821) 2019-09-13 16:01:26 +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-13 18:13:43 +02:00
user_invite_request.rb
…
web.rb
…