Skip to content

Conversation

ClearlyClaire
Copy link
Contributor

@ClearlyClaire ClearlyClaire commented Dec 22, 2023

This PR allows adding relaxed email domain blocks which allow people to register but requiring approval.

image

image


Fixes MAS-210

@ClearlyClaire ClearlyClaire added the moderation Administration and moderation tooling label Dec 22, 2023
@ClearlyClaire ClearlyClaire force-pushed the features/email_address_block-approval branch from 0d951de to 56abf1b Compare December 22, 2023 10:21
Copy link

codecov bot commented Dec 22, 2023

Codecov Report

Attention: 2 lines in your changes are missing coverage. Please review.

Comparison is base (74a0d81) 84.66% compared to head (3606cbc) 84.80%.
Report is 4 commits behind head on main.

Files Patch % Lines
...ontrollers/admin/email_domain_blocks_controller.rb 50.00% 1 Missing ⚠️
app/models/user.rb 75.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main   #28468      +/-   ##
==========================================
+ Coverage   84.66%   84.80%   +0.14%     
==========================================
  Files        1039     1039              
  Lines       28254    28287      +33     
  Branches     4556     4567      +11     
==========================================
+ Hits        23922    23990      +68     
+ Misses       3179     3139      -40     
- Partials     1153     1158       +5     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ClearlyClaire ClearlyClaire force-pushed the features/email_address_block-approval branch 3 times, most recently from 55ee8d9 to 8631dab Compare December 22, 2023 13:09
@ClearlyClaire ClearlyClaire marked this pull request as ready for review December 22, 2023 13:15
@renchap renchap requested a review from a team January 2, 2024 10:28
Copy link
Member

@renchap renchap left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, but maybe we should add some specs to ensure that signing up with a domain requiring approval does the correct thing?

@ClearlyClaire ClearlyClaire force-pushed the features/email_address_block-approval branch from 8631dab to 3606cbc Compare January 3, 2024 16:08
@ClearlyClaire
Copy link
Contributor Author

Added some more tests!

@ClearlyClaire ClearlyClaire added this pull request to the merge queue Jan 4, 2024
Merged via the queue into main with commit dfdadb9 Jan 4, 2024
@ClearlyClaire ClearlyClaire deleted the features/email_address_block-approval branch January 4, 2024 09:12
ClearlyClaire added a commit that referenced this pull request Jan 5, 2024
vmstan pushed a commit to vmstan/mastodon that referenced this pull request Jan 5, 2024
ClearlyClaire added a commit that referenced this pull request Jan 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
moderation Administration and moderation tooling
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants