djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-12 02:32:55 -05:00
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/app/models
History
Claire 3c7dbf3a16 Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream changed how the version string is built from environment variables.
  Adapted the logic to account for the `+glitch` in glitch-soc.
2023-09-02 11:56:09 +02:00
..
account
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
account_suggestions
Fix Performance/MapCompact cop (#24797)
2023-05-23 10:49:12 +02:00
admin
Fix ArgumentError in /api/v1/admin/accounts/:id/action (#25386)
2023-06-14 15:21:36 +02:00
concerns
Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream
2023-09-02 11:56:09 +02:00
form
Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream
2023-06-10 15:17:08 +02:00
trends
Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream
2023-07-12 16:03:05 +02:00
user_settings
Add privacy tab in profile settings (#26484)
2023-08-14 18:52:45 +02:00
web
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
account_alias.rb
Fix Style/SlicingWithRange cop (#25923)
2023-07-12 10:03:06 +02:00
account_conversation.rb
Fix /api/v1/conversations sometimes returning empty accounts (#25499)
2023-06-20 18:32:26 +02:00
account_deletion_request.rb
Change account suspensions to be reversible by default (#14726)
2020-09-15 14:37:58 +02:00
account_domain_block.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
account_filter.rb
Change moderation search an account using the username with @ (#24242)
2023-04-17 14:16:36 +02:00
account_migration.rb
Rename with_lock to with_redis_lock to avoid confusion with ActiveRecord's method (#24741)
2023-05-02 18:16:07 +02:00
account_moderation_note.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
account_note.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
account_pin.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
account_stat.rb
Autofix Rubocop Rails/IgnoredColumnsAssignment (#23761)
2023-03-31 15:07:22 +02:00
account_statuses_cleanup_policy.rb
Fix Performance/MapCompact cop (#24797)
2023-05-23 10:49:12 +02:00
account_statuses_filter.rb
Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream
2023-05-08 19:28:21 +02:00
account_suggestions.rb
Change auto-following admin-selected accounts, show in recommendations (#16078)
2021-04-24 17:01:43 +02:00
account_summary.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
account_warning_preset.rb
Add titles to warning presets in admin UI (#13252)
2020-03-12 17:57:59 +01:00
account_warning.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
account.rb
Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream
2023-09-02 11:41:40 +02:00
admin.rb
…
announcement_filter.rb
Fix error when passing unknown filter param in REST API (#20626)
2022-11-14 08:06:06 +01:00
announcement_mute.rb
Add announcements (#12662)
2020-01-23 22:00:13 +01:00
announcement_reaction.rb
Fix Rails/ActiveRecordCallbacksOrder cop (#24689)
2023-05-02 18:23:35 +02:00
announcement.rb
Rails 7.0 update (#25668)
2023-07-13 09:36:07 +02:00
appeal.rb
Fix Rails/InverseOf cop (#24732)
2023-04-30 14:06:53 +02:00
application_record.rb
Change DB_REPLICA_* environment variables to REPLICA_DB_* (#26386)
2023-08-08 13:59:40 +02:00
backup.rb
Fix user archive takeout when using OpenStack Swift or S3 providers with no ACL support (#24200)
2023-03-27 17:07:37 +02:00
block.rb
Fix Rails/ActiveRecordCallbacksOrder cop (#24689)
2023-05-02 18:23:35 +02:00
bookmark.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
bulk_import_row.rb
Rewrite import feature (#21054)
2023-05-02 12:08:48 +02:00
bulk_import.rb
Add support for importing lists (#25203)
2023-06-01 14:47:31 +02:00
canonical_email_block.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01: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_mute.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
conversation.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01: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
Fix error when passing unknown filter param in REST API (#20626)
2022-11-14 08:06:06 +01:00
custom_emoji.rb
Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream
2023-05-08 15:28:36 +02:00
custom_filter_keyword.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
custom_filter_status.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
custom_filter.rb
Autofix Rubocop Rails/IgnoredColumnsAssignment (#23761)
2023-03-31 15:07:22 +02:00
device.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
direct_feed.rb
Fix most rubocop issues (#2165)
2023-04-09 11:25:30 +02:00
domain_allow.rb
Autofix Rubocop Regex Style rules (#23690)
2023-06-06 14:50:51 +02:00
domain_block.rb
Fix Style/SlicingWithRange cop (#25923)
2023-07-12 10:03:06 +02:00
email_domain_block.rb
Fix Style/SlicingWithRange cop (#25923)
2023-07-12 10:03:06 +02:00
encrypted_message.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
export.rb
Add ability to filter followed accounts' posts by language (#19095)
2022-09-20 23:51:21 +02:00
extended_description.rb
Change about page to be mounted in the web UI (#19345)
2022-10-13 14:42:37 +02:00
favourite.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
featured_tag.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
feed.rb
allow pagination by min_id and max_id (#14776)
2020-09-12 17:09:49 +02:00
follow_recommendation_filter.rb
Fix Performance/MapCompact cop (#24797)
2023-05-23 10:49:12 +02:00
follow_recommendation_suppression.rb
Upgrade to latest redis-rb 4.x and fix deprecations (#23616)
2023-03-04 16:38:28 +01:00
follow_recommendation.rb
Change follow recommendation materialized view to be faster in most cases (#26545)
2023-08-18 18:20:55 +02:00
follow_request.rb
Change lists to be able to include accounts with pending follow requests (#19727)
2023-05-02 14:40:36 +02:00
follow.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
home_feed.rb
Revert support from loading Home timeline from database
2022-04-19 15:06:38 +02:00
identity.rb
Change Identity to not destroy associated User on destroy (#25098)
2023-05-23 15:00:36 +02:00
import.rb
Rewrite import feature (#21054)
2023-05-02 12:08:48 +02:00
instance_filter.rb
Fix error when passing unknown filter param in REST API (#20626)
2022-11-14 08:06:06 +01:00
instance.rb
Change interaction modal in web UI (#26075)
2023-07-27 16:11:17 +02:00
invite_filter.rb
Fix error when passing unknown filter param in REST API (#20626)
2022-11-14 08:06:06 +01:00
invite.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
ip_block.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
list_account.rb
Fix various edge cases with local moves (#24812)
2023-05-03 19:19:25 +02:00
list_feed.rb
Fix rubocop config and warnings (#15503)
2021-01-07 09:40:55 +01:00
list.rb
Fix incorrect model annotation for List#exclusive (#26313)
2023-08-04 09:00:31 +02:00
login_activity.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
marker.rb
Add timeline read markers API (#11762)
2019-09-06 13:55:51 +02:00
media_attachment.rb
Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream
2023-08-11 22:15:41 +02:00
mention.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
message_franking.rb
Add E2EE API (#13820)
2020-06-02 19:24:53 +02:00
mute.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
notification.rb
Rails 7.0 update (#25668)
2023-07-13 09:36:07 +02:00
one_time_key.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
poll_vote.rb
Fix single-record invalid condition on PollVote (#23810)
2023-02-27 09:31:15 +01:00
poll.rb
Fix Rails/CompactBlank cop (#24690)
2023-04-30 14:07:21 +02:00
preview_card_provider.rb
Fix Style/SlicingWithRange cop (#25923)
2023-07-12 10:03:06 +02:00
preview_card_trend.rb
Add support for language preferences for trending statuses and links (#18288)
2022-10-08 16:45:40 +02:00
preview_card.rb
Add alt text for preview card thumbnails (#26184)
2023-08-03 15:41:51 +02:00
privacy_policy.rb
Fix privacy policy being empty if custom setting exists but is empty (#19318)
2022-10-08 08:34:00 +02:00
public_feed.rb
Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream
2023-08-24 21:50:14 +02:00
relationship_filter.rb
Fix Performance/CollectionLiteralInLoop cop (#24819)
2023-05-04 05:33:55 +02:00
relay.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
remote_follow.rb
Autofix Rubocop Style/RedundantBegin (#23703)
2023-02-19 07:09:40 +09:00
report_filter.rb
Fix error when passing unknown filter param in REST API (#20626)
2022-11-14 08:06:06 +01:00
report_note.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
report.rb
Fix “legal” report category not showing up in moderation interface (#26509)
2023-08-16 16:38:33 +02:00
rule.rb
Fix rules with same priority being sorted non-deterministically (#20623)
2022-11-14 06:28:19 +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
Fix Rails/ActiveRecordCallbacksOrder cop (#24689)
2023-05-02 18:23:35 +02:00
setting.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
site_upload.rb
Autofix Rubocop Regex Style rules (#23690)
2023-06-06 14:50:51 +02:00
status_edit.rb
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-31 21:30:27 +02:00
status_pin.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
status_stat.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
status_trend.rb
Fix trending statuses returning more than one post by the same author (#19349)
2022-10-14 01:44:23 +02:00
status.rb
Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream
2023-09-02 11:41:40 +02:00
system_key.rb
Autofix Rubocop Lint/AmbiguousOperatorPrecedence (#23681)
2023-02-18 04:30:23 +01:00
tag_feed.rb
Merge branch 'main' into glitch-soc/merge-upstream
2022-11-10 09:36:47 +01:00
tag_follow.rb
Add ability to follow hashtags (#18809)
2022-07-17 13:49:29 +02:00
tag.rb
Autofix Rubocop Regex Style rules (#23690)
2023-06-06 14:50:51 +02:00
tombstone.rb
Record deleted(by mod) status to prevent re-appear (#10732)
2019-05-09 22:03:02 +02:00
translation.rb
Translate CW, poll options and media descriptions (#24175)
2023-06-01 00:10:21 +02:00
trends.rb
Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream
2023-07-12 15:38:35 +02:00
unavailable_domain.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01: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
user_ip.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
user_role.rb
Fix Performance/MapCompact cop (#24797)
2023-05-23 10:49:12 +02:00
user_settings.rb
Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab
2023-08-22 19:50:37 +02:00
user.rb
Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream
2023-07-12 15:38:35 +02:00
web.rb
…
webauthn_credential.rb
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
webhook.rb
Add report.updated webhook (#24211)
2023-07-24 17:37:38 +02:00