monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/spec/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 Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
admin Coverage improvement round-out following up previous work (#23987) 2023-03-10 13:33:30 +01:00
concerns Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
form Coverage improvement round-out following up previous work (#23987) 2023-03-10 13:33:30 +01:00
trends Pending example models minimal coverage (#23912) 2023-03-04 17:16:45 +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 Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
account_alias_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
account_conversation_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
account_deletion_request_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
account_domain_block_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
account_filter_spec.rb Autofix Rubocop RSpec/MatchArray (#24675) 2023-04-26 21:29:36 +02:00
account_migration_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
account_moderation_note_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
account_spec.rb Autofix Rubocop RSpec/MatchArray (#24050) 2023-04-26 20:21:54 +02:00
account_statuses_cleanup_policy_spec.rb Autofix Rubocop RSpec/MatchArray (#24050) 2023-04-26 20:21:54 +02:00
account_statuses_filter_spec.rb Autofix Rubocop RSpec/LeadingSubject (#23670) 2023-02-20 13:24:14 +09:00
account_warning_preset_spec.rb Models specs coverage (#23940) 2023-03-04 16:43:47 +01:00
announcement_mute_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
announcement_reaction_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
announcement_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
appeal_spec.rb Pending example models minimal coverage (#23912) 2023-03-04 17:16:45 +01:00
backup_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
block_spec.rb Fabricator specs (#23925) 2023-03-04 17:12:09 +01:00
canonical_email_block_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
conversation_mute_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
conversation_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
custom_emoji_category_spec.rb Pending example models minimal coverage (#23912) 2023-03-04 17:16:45 +01:00
custom_emoji_filter_spec.rb Autofix Rubocop RSpec/MatchArray (#24050) 2023-04-26 20:21:54 +02:00
custom_emoji_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
custom_filter_keyword_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
custom_filter_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
device_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
domain_allow_spec.rb Pending example models minimal coverage (#23912) 2023-03-04 17:16:45 +01:00
domain_block_spec.rb Fabricator specs (#23925) 2023-03-04 17:12:09 +01:00
email_domain_block_spec.rb Fabricator specs (#23925) 2023-03-04 17:12:09 +01:00
encrypted_message_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
export_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
extended_description_spec.rb Models specs coverage (#23940) 2023-03-04 16:43:47 +01:00
favourite_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
featured_tag_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
follow_recommendation_suppression_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
follow_request_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
follow_spec.rb Fabricator specs (#23925) 2023-03-04 17:12:09 +01:00
home_feed_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
identity_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
import_spec.rb Misc coverage improvements for validators (#23928) 2023-03-04 17:00:00 +01:00
invite_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
ip_block_spec.rb Pending example models minimal coverage (#23912) 2023-03-04 17:16:45 +01:00
list_account_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
list_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
login_activity_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
marker_spec.rb Pending example models minimal coverage (#23912) 2023-03-04 17:16:45 +01:00
media_attachment_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
mention_spec.rb Fabricator specs (#23925) 2023-03-04 17:12:09 +01:00
mute_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
notification_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
one_time_key_spec.rb Misc coverage improvements for validators (#23928) 2023-03-04 17:00:00 +01:00
poll_spec.rb Pending example models minimal coverage (#23912) 2023-03-04 17:16:45 +01:00
poll_vote_spec.rb Fix single-record invalid condition on PollVote (#23810) 2023-02-27 09:31:15 +01:00
preview_card_provider_spec.rb Models specs coverage (#23940) 2023-03-04 16:43:47 +01:00
preview_card_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
preview_card_trend_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
privacy_policy_spec.rb Models specs coverage (#23940) 2023-03-04 16:43:47 +01:00
public_feed_spec.rb Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
relationship_filter_spec.rb Fix followings list order | Issue #13538 (#13676) 2020-05-08 20:17:16 +02:00
relay_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
remote_follow_spec.rb Autofix Rubocop RSpec/LeadingSubject (#23670) 2023-02-20 13:24:14 +09:00
report_filter_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
report_spec.rb Fabricator specs (#23925) 2023-03-04 17:12:09 +01:00
rule_spec.rb Pending example models minimal coverage (#23912) 2023-03-04 17:16:45 +01:00
scheduled_status_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
session_activation_spec.rb Autofix Rubocop RSpec/ImplicitSubject (#23721) 2023-02-20 05:00:48 +01:00
setting_spec.rb Autofix Rubocop RSpec/LeadingSubject (#23670) 2023-02-20 13:24:14 +09:00
site_upload_spec.rb Add a test for SiteUpload#cache_key (#5685) 2017-11-14 20:44:11 +01:00
status_edit_spec.rb Pending example models minimal coverage (#23912) 2023-03-04 17:16:45 +01:00
status_pin_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
status_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
status_stat_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
status_trend_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
system_key_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
tag_feed_spec.rb Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
tag_follow_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
tag_spec.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
unavailable_domain_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
user_invite_request_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
user_role_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
user_settings_spec.rb Change user settings to be stored in a more optimal way (#23630) 2023-03-30 14:44:00 +02:00
user_spec.rb Autofix Rubocop RSpec/MatchArray (#24050) 2023-04-26 20:21:54 +02:00
webauthn_credentials_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
webhook_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00