mastodon/app/models
Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
2019-07-23 10:51:07 +02:00
..
admin Fix option to send e-mail notification about account action always being true (#11242) 2019-07-06 13:54:32 +02:00
concerns Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
form Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
web
account.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
account_conversation.rb
account_domain_block.rb
account_filter.rb Add moderation API (#9387) 2019-06-20 02:52:34 +02:00
account_identity_proof.rb Fix Keybase verification using wrong domain for remote accounts (#10547) 2019-04-10 20:28:43 +02:00
account_moderation_note.rb
account_pin.rb
account_stat.rb Add profile directory (#9427) 2018-12-06 17:36:11 +01:00
account_tag_stat.rb Add profile directory (#9427) 2018-12-06 17:36:11 +01:00
account_warning.rb Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
account_warning_preset.rb
admin.rb
application_record.rb Validate HTTP response length while receiving (#6891) 2018-03-26 14:02:10 +02:00
backup.rb Update dependencies for Ruby (2018-04-23) (#7237) 2018-04-23 11:29:17 +02:00
block.rb
bookmark.rb
context.rb
conversation.rb
conversation_mute.rb
custom_emoji.rb Add categories for custom emojis (#11196) 2019-06-28 15:54:10 +02:00
custom_emoji_category.rb Add categories for custom emojis (#11196) 2019-06-28 15:54:10 +02:00
custom_emoji_filter.rb
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_block.rb Change domain blocks to automatically support subdomains (#11138) 2019-06-22 00:13:10 +02:00
email_domain_block.rb
export.rb Export and import show_reblogs together with following list (#10495) 2019-04-08 07:28:27 +02:00
favourite.rb Fix error when trying to update counters for statuses that are gone (#8251) 2018-08-18 03:03:23 +02:00
featured_tag.rb
feed.rb
follow.rb
follow_request.rb
home_feed.rb Support min_id-based pagination in REST API (#8736) 2018-09-28 02:23:45 +02:00
identity.rb Change identities id column to a bigint (#9371) 2018-11-27 13:56:25 +01:00
import.rb Add option to overwrite imported data (#9962) 2019-02-03 03:59:51 +01:00
instance.rb Remove expensive counters from federation page in admin UI (#11139) 2019-06-22 00:39:09 +02:00
instance_filter.rb
invite.rb Keyword/phrase filtering (#7905) 2018-06-29 15:34:36 +02:00
invite_filter.rb Add invite filter (#5862) 2017-12-01 16:40:02 +01:00
list.rb
list_account.rb
list_feed.rb Lists (#5703) 2017-11-18 00:16:48 +01:00
media_attachment.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
mention.rb
mute.rb Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
notification.rb Add account_id param to GET /api/v1/notifications (#10796) 2019-05-21 13:28:49 +02:00
poll.rb
poll_vote.rb
preview_card.rb
relay.rb
remote_follow.rb Add remote interaction dialog for toots (#8202) 2018-08-18 03:03:12 +02:00
report.rb Add moderation API (#9387) 2019-06-20 02:52:34 +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 Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090) 2017-07-07 04:02:06 +02:00
session_activation.rb
setting.rb Remove intermediary arrays when creating hash maps from results (#9291) 2018-11-16 15:02:18 +01:00
site_upload.rb Improvements to image upload validation and creation (#10431) 2019-04-01 07:30:46 +02:00
status.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
status_pin.rb Update dependencies for Ruby (2018-04-23) (#7237) 2018-04-23 11:29:17 +02:00
status_stat.rb
tag.rb Disallow numeric-only hashtags (#11363) 2019-07-19 23:22:35 +02:00
tombstone.rb Record deleted(by mod) status to prevent re-appear (#10732) 2019-05-09 22:03:02 +02:00
trending_tags.rb
user.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
user_invite_request.rb Add "why do you want to join" field to invite requests (#10524) 2019-04-09 23:06:30 +09:00
web.rb Add extended about page stub 2017-01-13 03:24:41 +01:00