mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-28 05:23:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/app/models
History
Claire 12b935fadf Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, removed in glitch-soc to disable noise.
  Kept removed.
- `CODE_OF_CONDUCT.md`:
  Upstream updated to a new version of the covenant, but I have not read it
  yet, so kept unchanged.
- `Gemfile.lock`:
  Not a real conflict, one upstream dependency updated textually too close to
  the glitch-soc only `hcaptcha` dependency.
  Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/helpers/application_helper.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream added a highlight animation for onboarding, while we changed the
  max character limit.
  Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `stylelint.config.js`:
  Upstream added ignore paths, glitch-soc had extra ignore paths.
  Added the same paths as upstream.
2023-04-29 10:44:56 +02:00
..
account Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
account_suggestions Fix admin-set follow recommandations being case-sensitive (#23500) 2023-02-10 11:14:58 +01:00
admin Autofix Rubocop Rails/IgnoredColumnsAssignment (#23761) 2023-03-31 15:07:22 +02:00
concerns Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
form Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
trends Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
user_settings Wrong type for user setting when default is defined by lambda (#24321) 2023-03-31 07:33:17 +02:00
web Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
account.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
account_alias.rb Micro-optimization: only split acct into two Strings (#19901) 2022-11-07 16:17:55 +01:00
account_conversation.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01: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 Fix 500 error when trying to migrate to an invalid address (#21462) 2022-12-07 02:35:39 +01: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 Minor clean up and optimization of the automatic post deletion code (#24613) 2023-04-21 16:53:50 +02:00
account_statuses_filter.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01: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.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
admin.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00
announcement.rb Autofix Rubocop Rails/WhereEquals (#23759) 2023-02-21 03:20:56 +09:00
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 Add announcements (#12662) 2020-01-23 22:00:13 +01:00
appeal.rb Add audit log entries for user roles (#19040) 2022-08-25 20:39:40 +02:00
application_record.rb Fix records not being indexed sometimes (#12024) 2019-10-01 01:19:11 +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 Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
bookmark.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01: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 Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090) 2017-07-07 04:02:06 +02:00
conversation.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
conversation_mute.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
custom_emoji.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +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_filter.rb Autofix Rubocop Rails/IgnoredColumnsAssignment (#23761) 2023-03-31 15:07:22 +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
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 Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597) 2022-11-17 11:05:09 +01:00
domain_block.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
email_domain_block.rb Autofix Rubocop Rails/IgnoredColumnsAssignment (#23761) 2023-03-31 15:07:22 +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.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
follow_recommendation.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
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 Upgrade to latest redis-rb 4.x and fix deprecations (#23616) 2023-03-04 16:38:28 +01:00
follow_request.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 Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
import.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
instance.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
instance_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
invite_filter.rb Fix error when passing unknown filter param in REST API (#20626) 2022-11-14 08:06:06 +01:00
ip_block.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
list.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
list_account.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
list_feed.rb Fix rubocop config and warnings (#15503) 2021-01-07 09:40:55 +01: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 branch 'main' into glitch-soc/merge-upstream 2023-03-31 21:30:27 +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 Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
one_time_key.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
poll.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
preview_card.rb Change media upload limits and remove client-side resizing (#23726) 2023-03-25 10:00:03 +01:00
preview_card_provider.rb Add trend management to admin API (#24257) 2023-04-18 11:33:30 +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
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 branch 'main' into glitch-soc/merge-upstream 2022-11-10 09:36:47 +01:00
relationship_filter.rb Fix error when passing unknown filter param in REST API (#20626) 2022-11-14 08:06:06 +01: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.rb Autofix Rubocop Rails/IgnoredColumnsAssignment (#23761) 2023-03-31 15:07:22 +02: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
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 Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090) 2017-07-07 04:02:06 +02:00
session_activation.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
setting.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
site_upload.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
status.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-04-16 17:52:44 +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
system_key.rb Autofix Rubocop Lint/AmbiguousOperatorPrecedence (#23681) 2023-02-18 04:30:23 +01:00
tag.rb fixed typo in a constant name (#24511) 2023-04-12 10:06:57 +02: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
tombstone.rb Record deleted(by mod) status to prevent re-appear (#10732) 2019-05-09 22:03:02 +02:00
trends.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
unavailable_domain.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
user.rb Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +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
user_ip.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
user_role.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
user_settings.rb Migrate glitch-soc's exclusive user settings 2023-03-31 22:50:57 +02:00
web.rb
webauthn_credential.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
webhook.rb Webhooks for local status.create, status.update, account.update (#24133) 2023-03-19 07:47:54 +01:00