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.

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

Fix subscription expiration condition #2715

Merged
merged 2 commits into from
May 2, 2017
Merged

Fix subscription expiration condition #2715

merged 2 commits into from
May 2, 2017

Conversation

ykzts
Copy link
Member

@ykzts ykzts commented May 2, 2017

@Gargron I was mistaken in #2712. I fixed it so please check it again.

@@ -11,7 +11,7 @@
%th= t('admin.pubsubhubbub.last_delivery')
%tbody
- @subscriptions.each do |subscription|
- expired = Time.now.utc < subscription.expires_at
- expired = Time.now.utc > subscription.expires_at
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you put this into a method on subscription, instead of setting a variable in a view?

Copy link
Member Author

Choose a reason for hiding this comment

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

Certainly. That is beautiful.

Copy link
Member Author

Choose a reason for hiding this comment

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

OK. And, add spec 4784f0e.

@Gargron Gargron merged commit 6f75c84 into mastodon:master May 2, 2017
@ykzts ykzts deleted the patch-2 branch May 2, 2017 16:27
ClearlyClaire added a commit to ClearlyClaire/mastodon that referenced this pull request May 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants