luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-17 20:32:56 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/models
History
Claire 221580a3af Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/home_controller.rb`:
  Upstream made it so `/web` is available to non-logged-in users
  and `/` redirects to `/web` instead of `/about`.
  Kept our version since glitch-soc's WebUI doesn't have what's
  needed yet and I think /about is still a much better landing
  page anyway.
- `app/models/form/admin_settings.rb`:
  Upstream added new settings, and glitch-soc had an extra setting.
  Not really a conflict.
  Added upstream's new settings.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a new `server` initial state object.
  Not really a conflict.
  Merged upstream's changes.
- `app/views/admin/settings/edit.html.haml`:
  Upstream added new settings.
  Not really a conflict.
  Merged upstream's changes.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
  Upstream refactored that part and removed the file.
  Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb`
- `config/settings.yml`:
  Upstream added new settings.
  Not a real conflict.
  Added upstream's new settings.
2022-10-02 18:46:22 +02:00
..
account_suggestions Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
admin Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
concerns Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
form Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
trends Merge branch 'main' into glitch-soc/merge-upstream 2022-05-24 13:59:21 +02:00
web
account.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
account_alias.rb Fix crash in alias settings page (#18004) 2022-04-09 20:11:06 +02:00
account_conversation.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
account_deletion_request.rb
account_domain_block.rb
account_filter.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
account_migration.rb Refactor how Redis locks are created (#18400) 2022-05-13 00:02:35 +02:00
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 Add API endpoint to list featured accounts (fixes #8315) (#8317) 2018-08-20 18:46:04 +02:00
account_stat.rb Fix follower and other counters being able to go negative (#18517) 2022-05-26 20:32:48 +02:00
account_statuses_cleanup_policy.rb Add option to automatically delete toots after one week (#17691) 2022-03-03 16:18:58 +01:00
account_statuses_filter.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
account_suggestions.rb
account_summary.rb
account_warning.rb Add audit log entries for user roles (#19040) 2022-08-25 20:39:40 +02:00
account_warning_preset.rb
admin.rb
announcement.rb Add audit log entries for user roles (#19040) 2022-08-25 20:39:40 +02:00
announcement_filter.rb
announcement_mute.rb
announcement_reaction.rb
appeal.rb Add audit log entries for user roles (#19040) 2022-08-25 20:39:40 +02:00
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 admin API for managing canonical e-mail blocks (#19067) 2022-08-28 03:31:54 +02:00
content_retention_policy.rb Add retention policy for cached content and media (#19232) 2022-09-27 03:08:19 +02:00
context.rb
conversation.rb
conversation_mute.rb
custom_emoji.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
custom_emoji_category.rb
custom_emoji_filter.rb
custom_filter.rb Add ability to filter individual posts (#18945) 2022-08-25 04:27:47 +02:00
custom_filter_keyword.rb Change how hashtags are normalized (#18795) 2022-07-13 15:03:28 +02:00
custom_filter_status.rb Add ability to select all accounts matching search for batch actions (#19053) 2022-08-25 23:33:34 +02:00
device.rb
direct_feed.rb
domain_allow.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
domain_block.rb Add audit log entries for user roles (#19040) 2022-08-25 20:39:40 +02:00
email_domain_block.rb Add admin API for managing e-mail domain blocks (#19066) 2022-08-28 03:37:55 +02:00
encrypted_message.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
export.rb Add ability to filter followed accounts' posts by language (#19095) 2022-09-20 23:51:21 +02:00
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 Fix nil error when rendering featured hashtags on profile (#18808) 2022-07-14 01:23:10 +02:00
feed.rb
follow.rb Add ability to filter followed accounts' posts by language (#19095) 2022-09-20 23:51:21 +02:00
follow_recommendation.rb
follow_recommendation_filter.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
follow_recommendation_suppression.rb
follow_request.rb Add ability to filter followed accounts' posts by language (#19095) 2022-09-20 23:51:21 +02:00
home_feed.rb Revert support from loading Home timeline from database 2022-04-19 15:06:38 +02:00
identity.rb
import.rb
instance.rb Add audit log entries for user roles (#19040) 2022-08-25 20:39:40 +02:00
instance_filter.rb Change design of federation pages in admin UI (#17704) 2022-03-09 08:52:32 +01:00
invite.rb
invite_filter.rb
ip_block.rb Add admin API for managing IP blocks (#19065) 2022-08-27 20:56:47 +02:00
list.rb Improve account deletion performances further (#15407) 2020-12-22 23:57:46 +01:00
list_account.rb
list_feed.rb
login_activity.rb
marker.rb Add timeline read markers API (#11762) 2019-09-06 13:55:51 +02:00
media_attachment.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-07-03 21:36:15 +02:00
mention.rb
message_franking.rb
mute.rb Various code cleanup (#1782) 2022-05-25 12:27:11 +02:00
notification.rb Add notifications for new reports (#18697) 2022-06-27 09:30:15 +02:00
one_time_key.rb
poll.rb Fix regression in tootctl search deploy caused by unloaded attribute (#18514) 2022-05-26 18:05:47 +02:00
poll_vote.rb
preview_card.rb Add support for webp uploads (#18506) 2022-05-27 20:06:40 +02:00
preview_card_provider.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
public_feed.rb
relationship_filter.rb
relay.rb
remote_follow.rb
report.rb Add audit log entries for user roles (#19040) 2022-08-25 20:39:40 +02:00
report_filter.rb Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
report_note.rb
rule.rb
scheduled_status.rb
search.rb
session_activation.rb
setting.rb
site_upload.rb
status.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
status_edit.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-10 09:52:45 +01:00
status_pin.rb Add feature to automatically delete old toots (#16529) 2021-08-09 23:11:50 +02:00
status_stat.rb Fix follower and other counters being able to go negative (#18517) 2022-05-26 20:32:48 +02:00
system_key.rb
tag.rb Fix unicode regression in #18809 (#18863) 2022-07-22 03:17:56 +02:00
tag_feed.rb
tag_follow.rb Add ability to follow hashtags (#18809) 2022-07-17 13:49:29 +02:00
tombstone.rb
trends.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
unavailable_domain.rb Add audit log entries for user roles (#19040) 2022-08-25 20:39:40 +02:00
user.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
user_invite_request.rb
user_ip.rb Remove IP tracking columns from users table (#16409) 2022-01-16 13:23:50 +01:00
user_role.rb Add audit log entries for user roles (#19040) 2022-08-25 20:39:40 +02:00
web.rb
webauthn_credential.rb
webhook.rb Add administrative webhooks (#18510) 2022-06-09 21:57:36 +02:00