Mastodon

History

Claire 0b2c7cdb02 Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream

Conflicts:
- `app/lib/content_security_policy.rb`:
  Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
  environment variable.
  Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.

2024-01-10 17:51:12 +01:00

account_actions

Extract helper methods for form label in admin/ area views (#27575 )

2023-11-29 10:06:19 +00:00

account_warnings

Fix crash when viewing a moderation appeal and the moderator account has been deleted (#25900 )

2023-09-18 17:41:32 +02:00

accounts

Fix Style/SoleNestedConditional and Style/IfInsideElse cops, regenerate haml todo (#28384 )

2023-12-18 10:06:42 +00:00

action_logs

Consolidate inclusion of admin js pack link (#26628 )

2023-08-24 09:56:23 +02:00

announcements

Fix haml-lint Rubocop Rails/* cops (#26042 )

2023-10-03 15:00:40 +02:00

change_emails

Fix more haml-lint Rubocop (#24107 )

2023-03-15 20:07:43 +01:00

custom_emojis

Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream

2023-12-19 21:24:01 +01:00

dashboard

Consolidate inclusion of admin js pack link (#26628 )

2023-08-24 09:56:23 +02:00

disputes/appeals

Refactor appeal partial to avoid brakeman XSS warning (#25880 )

2023-10-19 17:25:54 +02:00

domain_allows

Consolidate inclusion of admin js pack link (#26628 )

2023-08-24 09:56:23 +02:00

domain_blocks

Solve simplest haml-lint Rubocop lints (#27529 )

2023-10-25 12:38:01 +00:00

email_domain_blocks

Add ability to require approval when users sign up using specific email domains (#28468 )

2024-01-04 09:07:05 +00:00

export_domain_allows

…

export_domain_blocks

Consolidate inclusion of admin js pack link (#26628 )

2023-08-24 09:56:23 +02:00

follow_recommendations

Change algorithm of follow recommendations (#28314 )

2023-12-19 10:59:43 +00:00

instances

Add support for displaying unknown servers on /admin/instances/:domain (#27150 )

2023-10-23 14:27:57 +02:00

invites

Fix haml-lint InstanceVariables rule for invites/_form (#26064 )

2023-09-28 15:40:28 +02:00

ip_blocks

Extract helper methods for form label in admin/ area views (#27575 )

2023-11-29 10:06:19 +00:00

relationships

…

relays

Fix haml-lint UnnecessaryStringOutput for views (#27531 )

2023-10-25 12:01:00 +00:00

report_notes

…

reports

Fix Style/HashEachMethods cop in HAML files (#28178 )

2023-12-04 09:09:43 +00:00

roles

Refactor, lint fix, and bug fix on admin/roles/form partial (#27558 )

2023-11-29 10:00:52 +00:00

rules

Fix haml-lint UnnecessaryStringOutput for views (#27531 )

2023-10-25 12:01:00 +00:00

settings

Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream

2023-12-20 20:10:45 +01:00

software_updates

Solve simplest haml-lint Rubocop lints (#27529 )

2023-10-25 12:38:01 +00:00

status_edits

…

statuses

Use helper method to build batched status edits in admin/statuses/show (#27739 )

2023-11-08 13:04:52 +00:00