FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/spec/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
..
admin Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
concerns Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
trends Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
web Fix various typos (#17621) 2022-02-22 20:14:17 +01:00
account_alias_spec.rb
…
account_conversation_spec.rb
…
account_deletion_request_spec.rb Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
account_domain_block_spec.rb
…
account_filter_spec.rb Add batch suspend for accounts in admin UI (#17009) 2021-12-05 21:48:39 +01:00
account_migration_spec.rb
…
account_moderation_note_spec.rb
…
account_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
account_statuses_cleanup_policy_spec.rb Fix some flaky tests that randomly failed because of item ordering (#17509) 2022-02-10 22:00:10 +01:00
account_statuses_filter_spec.rb Fix performance of account timelines (#17709) 2022-03-08 09:14:39 +01:00
announcement_mute_spec.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
announcement_reaction_spec.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
announcement_spec.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
appeal_spec.rb Add appeals (#17364) 2022-02-14 21:27:53 +01:00
backup_spec.rb
…
block_spec.rb
…
canonical_email_block_spec.rb Add canonical e-mail blocks for suspended accounts (#16049) 2021-04-17 03:14:25 +02:00
conversation_mute_spec.rb
…
conversation_spec.rb
…
custom_emoji_category_spec.rb
…
custom_emoji_filter_spec.rb
…
custom_emoji_spec.rb
…
custom_filter_keyword_spec.rb Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
custom_filter_spec.rb
…
device_spec.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
domain_allow_spec.rb
…
domain_block_spec.rb Allow blocking TLDs, and fix TLD blocks not being editable (#12805) 2020-01-08 22:42:05 +01:00
email_domain_block_spec.rb Change e-mail domain blocks to match subdomains of blocked domains (#18979) 2022-08-24 19:00:55 +02:00
encrypted_message_spec.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
export_spec.rb Add ability to filter followed accounts' posts by language (#19095) 2022-09-20 23:51:21 +02:00
favourite_spec.rb
…
featured_tag_spec.rb
…
follow_recommendation_suppression_spec.rb Add cold-start follow recommendations (#15945) 2021-04-12 12:37:14 +02:00
follow_request_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
follow_spec.rb Fix follow limit preventing re-following of a moved account (#14207) 2020-12-18 09:18:31 +01:00
home_feed_spec.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
identity_spec.rb
…
import_spec.rb Fix follow limit preventing re-following of a moved account (#14207) 2020-12-18 09:18:31 +01:00
invite_spec.rb Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
ip_block_spec.rb Add IP-based rules (#14963) 2020-10-12 16:33:49 +02:00
list_account_spec.rb
…
list_spec.rb
…
login_activity_spec.rb Add authentication history (#16408) 2021-06-21 17:07:30 +02:00
marker_spec.rb
…
media_attachment_spec.rb Fix edits with no actual changes being allowed (#17843) 2022-03-26 00:38:44 +01:00
mention_spec.rb
…
mute_spec.rb
…
notification_spec.rb Improved performance of notification preloading (#15640) 2021-01-31 21:24:57 +01:00
one_time_key_spec.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
poll_spec.rb
…
poll_vote_spec.rb
…
preview_card_spec.rb
…
public_feed_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00
relationship_filter_spec.rb Fix followings list order | Issue #13538 (#13676) 2020-05-08 20:17:16 +02:00
relay_spec.rb
…
remote_follow_spec.rb
…
report_filter_spec.rb
…
report_spec.rb Change how changes to media attachments are stored for edits (#17696) 2022-03-09 09:06:17 +01:00
rule_spec.rb Add server rules (#15769) 2021-02-21 19:50:12 +01:00
scheduled_status_spec.rb
…
session_activation_spec.rb Add Ruby 3.0 support (#16046) 2021-05-06 14:22:54 +02:00
setting_spec.rb Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
site_upload_spec.rb
…
status_edit_spec.rb Add support for editing for published statuses (#16697) 2022-01-19 22:37:27 +01:00
status_pin_spec.rb Add support for private pinned posts (#16954) 2022-01-17 00:49:55 +01:00
status_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
status_stat_spec.rb
…
system_key_spec.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
tag_feed_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
tag_follow_spec.rb Add ability to follow hashtags (#18809) 2022-07-17 13:49:29 +02:00
tag_spec.rb Change how hashtags are normalized (#18795) 2022-07-13 15:03:28 +02:00
unavailable_domain_spec.rb Change delivery failure tracking to work with hostnames instead of URLs (#13437) 2020-04-15 20:33:24 +02:00
user_invite_request_spec.rb
…
user_role_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
user_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
webauthn_credentials_spec.rb Fix validates :sign_count of WebauthnCredential (#14806) 2020-09-16 20:16:46 +02:00
webhook_spec.rb Add administrative webhooks (#18510) 2022-06-09 21:57:36 +02:00