FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/models
History
Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- .eslintrc.yml
  Removed, as upstream removed it.
- app/controllers/admin/statuses_controller.rb
  Minor code cleanup when porting one of our features.
- app/models/account.rb
  Note length validation has changed upstream.
  We now use upstream's validation (dropped legacy glitch-soc
  account metadata stuff) but with configurable limit.
- app/services/post_status_service.rb
  Upstream has added support for scheduled toots, refactoring
  the code a bit. Adapted our changes to this refactoring.
- app/views/stream_entries/_detailed_status.html.haml
  Not a real conflict, changes too close.
- app/views/stream_entries/_simple_status.html.haml
  Not a real conflict, changes too close.
 		2019-01-10 21:00:30 +01:00
..
admin Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
concerns Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
form Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
web Do no retry web push workers if the server returns a 4xx response (#9434) 2018-12-17 03:14:13 +01:00
account.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
account_conversation.rb Migrate all old direct messages to new conversations schema (#9085) 2018-10-25 01:44:02 +02:00
account_domain_block.rb
…
account_filter.rb Redesign admin accounts index (#9340) 2018-11-26 15:53:27 +01:00
account_moderation_note.rb
…
account_pin.rb Add API endpoint to list featured accounts (fixes #8315) (#8317) 2018-08-20 18:46:04 +02:00
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 Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
admin.rb
…
application_record.rb
…
backup.rb
…
block.rb
…
bookmark.rb
…
context.rb
…
conversation.rb
…
conversation_mute.rb
…
custom_emoji.rb Make custom emoji domains case insensitive #9351 (#9474) 2018-12-11 05:30:57 +01:00
custom_emoji_filter.rb Make custom emoji domains case insensitive #9351 (#9474) 2018-12-11 05:30:57 +01:00
custom_filter.rb
…
domain_block.rb Create DomainNormalizable#normalize_domain (#9631) 2018-12-26 06:38:42 +01:00
email_domain_block.rb Create DomainNormalizable#normalize_domain (#9631) 2018-12-26 06:38:42 +01:00
export.rb Add CSV export for lists and domain blocks (#9677) 2019-01-01 13:44:04 +01:00
favourite.rb Fix error when trying to update counters for statuses that are gone (#8251) 2018-08-18 03:03:23 +02:00
feed.rb Support min_id-based pagination in REST API (#8736) 2018-09-28 02:23:45 +02:00
follow.rb Extract counters from accounts table to account_stats table (#9295) 2018-11-19 00:43:52 +01:00
follow_request.rb Limit the number of people that can be followed from one account (#8807) 2018-10-04 17:36:11 +02:00
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
…
instance.rb Redesign admin instances area (#9645) 2019-01-08 13:39:49 +01:00
instance_filter.rb Redesign admin instances area (#9645) 2019-01-08 13:39:49 +01:00
invite.rb
…
invite_filter.rb
…
list.rb Add database support for list show-reply preferences 2018-11-28 14:46:07 +01:00
list_account.rb
…
list_feed.rb
…
media_attachment.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
mention.rb Improve support for aspects/circles (#8950) 2018-10-17 17:13:04 +02:00
mute.rb
…
notification.rb Extract counters from accounts table to account_stats table (#9295) 2018-11-19 00:43:52 +01:00
preview_card.rb
…
relay.rb Use Contact User as Relay, Report, Subscribe. (#9661) 2019-01-05 07:17:12 +01:00
remote_follow.rb Add remote interaction dialog for toots (#8202) 2018-08-18 03:03:12 +02:00
remote_profile.rb
…
report.rb Add preference for report notification e-mails, skip for duplicates (#8559) 2018-09-02 00:11:58 +02:00
report_filter.rb
…
report_note.rb Fix scope latest of ReportNote (#9630) 2018-12-26 06:38:59 +01:00
scheduled_status.rb Fix deleting a scheduled status immediately deleting media attachments (#9728) 2019-01-06 16:38:40 +01:00
search.rb
…
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
…
status.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-06 12:44:38 +01:00
status_pin.rb
…
status_stat.rb Reset status cache when status_stat or media_attachment updates (#9119) 2018-10-28 06:42:34 +01:00
stream_entry.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
subscription.rb
…
tag.rb Cache hashtag sample accounts, and exclude ineligible ones (#9465) 2018-12-08 01:32:26 +01:00
trending_tags.rb Remove intermediary arrays when creating hash maps from results (#9291) 2018-11-16 15:02:18 +01:00
user.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
web.rb
…