Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AO3-6609 Allow users to resend invitations #4648

Merged
merged 11 commits into from
Dec 3, 2023
Merged

AO3-6609 Allow users to resend invitations #4648

merged 11 commits into from
Dec 3, 2023

Conversation

weeklies
Copy link
Contributor

Pull Request Checklist

Issue

https://otwarchive.atlassian.net/browse/AO3-6609

Purpose

Allow users to resend invitations. Adds resent_at to invitations and a cooldown period before users can request invitations to be resent.

Testing Instructions

See Jira issue.

Credit

tickinginstant
weeklies (she/her)

@github-actions github-actions bot added Has Migrations Contains migrations and therefore needs special attention when deploying Awaiting Review labels Oct 27, 2023
@weeklies weeklies marked this pull request as ready for review October 27, 2023 20:12
@brianjaustin brianjaustin self-requested a review October 29, 2023 19:10
brianjaustin
brianjaustin reviewed Oct 29, 2023
View reviewed changes
app/views/invitations/_invitation.html.erb Outdated Show resolved Hide resolved
app/controllers/invite_requests_controller.rb Outdated Show resolved Hide resolved
app/models/invitation.rb Outdated Show resolved Hide resolved
app/models/invitation.rb Outdated Show resolved Hide resolved
app/views/invite_requests/show.html.erb Outdated Show resolved Hide resolved
app/views/invite_requests/show.js.erb Outdated Show resolved Hide resolved
config/locales/views/en.yml Outdated Show resolved Hide resolved
config/locales/views/en.yml Outdated Show resolved Hide resolved
@weeklies @brianjaustin
Apply suggestions
cafb1ba 
Co-authored-by: Brian Austin <[email protected]>
brianjaustin
brianjaustin approved these changes Oct 31, 2023
View reviewed changes
Copy link
Member

@brianjaustin brianjaustin left a comment

Choose a reason for hiding this comment

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

Thank you!

@weeklies
Copy link
Contributor Author

I will need to fix the test failure, so this still needs another commit.

@weeklies @brianjaustin
Fix spec
44ca889 
Co-authored-by: Brian Austin <[email protected]>
@sarken sarken merged commit 6c30419 into otwcode:master Dec 3, 2023
24 checks passed
@brianjaustin brianjaustin mentioned this pull request Dec 3, 2023
Closed
@weeklies weeklies mentioned this pull request Dec 8, 2023
Merged
sarken added a commit to sarken/otwarchive that referenced this pull request Jan 8, 2024
@sarken
Revert "AO3-6609 Allow users to resend invitations (otwcode#4648)"
2595dfb 
This reverts commit 6c30419.
redsummernight pushed a commit that referenced this pull request Jan 8, 2024
@sarken
AO3-6666 Revert AO3-6609 invitation resending (#4689) (#4685) (#4648) (…
7e15f32 
…#4710)

* Revert "AO3-6609 Fix status check of old invites without sent_at (#4689)"

This reverts commit 1f9e339.

* Revert "AO3-6609 Visual fixes for invitation status  (#4685)"

This reverts commit 69f97e0.

* Revert "AO3-6609 Allow users to resend invitations (#4648)"

This reverts commit 6c30419.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brianjaustin brianjaustin brianjaustin approved these changes

@sarken sarken sarken left review comments

Assignees
No one assigned
Labels
Has Migrations Contains migrations and therefore needs special attention when deploying Reviewed: Ready to Merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@weeklies @sarken @brianjaustin @tickinginstant