mastodon/app/models/concerns
Claire d77fbbed73 Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes, but we had removed it.
  Discarded upstream changes.
- `.rubocop_todo.yml`:
  Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
  Minor upstream code style change where glitch-soc had slightly different code
  due to handling of local-only posts.
  Updated to match upstream's code style.
- `app/models/status.rb`:
  Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
  Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
  Upstream rewrote a lot of the backup service, glitch-soc had changes because
  of exporting local-only posts.
  Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
  Upstream split the file into different files, while glitch-soc had a few
  extra routes.
  Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
  and `config/routes/admin.rb`
- `db/schema.rb`:
  Upstream has new migrations, while glitch-soc had an extra migration.
  Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
  Upstream added support to set version tags from environment variables, while
  glitch-soc has an extra `+glitch` tag.
  Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests due to
  `directMessage` handling.
  Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests.
  Applied upstream's changes while keeping glitch-soc's extra tests.
2023-05-08 19:28:21 +02:00
..
account_associations.rb Rewrite import feature (#21054) 2023-05-02 12:08:48 +02:00
account_avatar.rb
account_counters.rb
account_finder_concern.rb
account_header.rb
account_interactions.rb Fix own posts not getting delivered to own lists (#24810) 2023-05-03 19:17:40 +02:00
account_merging.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
account_search.rb Extract AccountSearch concern from Account (#24716) 2023-05-02 18:21:36 +02:00
attachmentable.rb Fix Rails/CompactBlank cop (#24690) 2023-04-30 14:07:21 +02:00
cacheable.rb
domain_materializable.rb
domain_normalizable.rb
expireable.rb Run rubocop formatting except line length (#23632) 2023-02-18 06:56:20 +09:00
follow_limitable.rb
has_user_settings.rb Migrate glitch-soc's exclusive user settings 2023-03-31 22:50:57 +02:00
ldap_authenticable.rb Fix unescaped user input in LDAP query (#24379) 2023-04-04 12:42:38 +02:00
lockable.rb Rename with_lock to with_redis_lock to avoid confusion with ActiveRecord's method (#24741) 2023-05-02 18:16:07 +02:00
omniauthable.rb Drop EOL Ruby 2.7 (#24237) 2023-04-27 01:46:18 +02:00
paginable.rb Autofix Rubocop Style/Lambda (#23696) 2023-02-18 12:39:00 +01:00
pam_authenticable.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
rate_limitable.rb
redisable.rb
relationship_cacheable.rb
remotable.rb
status_safe_reblog_insert.rb Extract StatusSafeReblogInsert concern from Status (#24821) 2023-05-04 14:06:20 +02:00
status_snapshot_concern.rb
status_threading_concern.rb Refactoring relations_map (#24195) 2023-03-21 10:32:58 +01:00