glitchier-soc/app/models
Claire 3ef5f62abf Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream switched to pushing to both DockerHub and GitHub Container
  Repository, while glitch-soc was already pushing to the latter only.
  Updated our configuration to be slightly more consistent with upstream's
  naming and styling, but kept our behavior.
- `Gemfile.lock`:
  Updated dependencies textually too close to glitch-soc only hcaptcha
  dependency.
  Updated dependencies as upstream did.
- `README.md`:
  Upstream updated its README, but we have a completely different one.
  Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
  Minor style fix upstream that's on a line glitch-soc removed because
  of its different theming system.
  Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
  This file apparently did not exist upstream, upstream created it with
  different contents but it is functionally the same.
  Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
  had its own code because it's a fork and does not have the same default
  source URL.
  Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
  Upstream dependencies textually too close to a glitch-soc only one.
  Updated dependencies as upstream did.
2023-03-15 09:16:10 +01: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
concerns Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
form Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
trends
web
account.rb
account_alias.rb
account_conversation.rb
account_deletion_request.rb
account_domain_block.rb
account_filter.rb Fix deprecation warning about merging conditions (#23618) 2023-03-02 16:21:04 +01:00
account_migration.rb
account_moderation_note.rb
account_note.rb
account_pin.rb
account_stat.rb
account_statuses_cleanup_policy.rb
account_statuses_filter.rb
account_suggestions.rb
account_summary.rb
account_warning.rb
account_warning_preset.rb
admin.rb
announcement.rb
announcement_filter.rb
announcement_mute.rb
announcement_reaction.rb
appeal.rb
application_record.rb
backup.rb
block.rb
bookmark.rb
canonical_email_block.rb
content_retention_policy.rb
context.rb
conversation.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
conversation_mute.rb
custom_emoji.rb
custom_emoji_category.rb
custom_emoji_filter.rb
custom_filter.rb
custom_filter_keyword.rb
custom_filter_status.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
device.rb
direct_feed.rb
domain_allow.rb
domain_block.rb
email_domain_block.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
encrypted_message.rb
export.rb
extended_description.rb
favourite.rb
featured_tag.rb
feed.rb
follow.rb
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 Upgrade to latest redis-rb 4.x and fix deprecations (#23616) 2023-03-04 16:38:28 +01:00
follow_request.rb
home_feed.rb
identity.rb
import.rb
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
invite_filter.rb
ip_block.rb
list.rb
list_account.rb
list_feed.rb
login_activity.rb
marker.rb
media_attachment.rb
mention.rb
message_franking.rb
mute.rb
notification.rb
one_time_key.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
poll.rb
poll_vote.rb Fix single-record invalid condition on PollVote (#23810) 2023-02-27 09:31:15 +01:00
preview_card.rb
preview_card_provider.rb
preview_card_trend.rb
privacy_policy.rb
public_feed.rb
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
report.rb
report_filter.rb
report_note.rb
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
setting.rb
site_upload.rb
status.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
status_edit.rb
status_pin.rb
status_stat.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
status_trend.rb
system_key.rb
tag.rb
tag_feed.rb
tag_follow.rb
tombstone.rb
trends.rb
unavailable_domain.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
user.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
user_invite_request.rb
user_ip.rb
user_role.rb
web.rb
webauthn_credential.rb
webhook.rb