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

Fix bug letting already logged in users see login and forgot password forms #728

Merged
merged 14 commits into from
Sep 12, 2019
Merged

Fix bug letting already logged in users see login and forgot password forms #728

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6e85d0d
Fix typo in the flash message shown when wiped user tries to reset pa…
arandomandy Aug 20, 2019
c336fb5
Remove inactive-user from BANNED_USERNAMES
arandomandy Aug 20, 2019
e5af60f
Merge remote-tracking branch 'upstream/master'
arandomandy Aug 21, 2019
e897d2c
Fix bug letting already logged in users see login and forgot password…
arandomandy Aug 22, 2019
1a19bef
Fix broken test
arandomandy Aug 22, 2019
f80b5f0
Add tests for when a logged in user attempts to go to /login or /logi…
arandomandy Aug 22, 2019
a40acaf
Fix inconsistent identation
arandomandy Aug 22, 2019
bdc93c2
Merge remote-tracking branch 'upstream/master'
arandomandy Sep 4, 2019
4a8b75e
Make mail_new_activity no-op silently
arandomandy Sep 4, 2019
fccaf10
Revert "Make mail_new_activity no-op silently"
arandomandy Sep 4, 2019
e0f66f1
Fix tests calling wrong methods
arandomandy Sep 8, 2019
c76d08f
Disable caching when running tests
arandomandy Sep 12, 2019
95f8a7f
Visit the logout path rather than resetting the session
arandomandy Sep 12, 2019
e824bb5
Replace if statements with guard-clauses
arandomandy Sep 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make mail_new_activity no-op silently
  • Loading branch information
@arandomandy
arandomandy committed Sep 4, 2019
commit 4a8b75e81b909550086ede9e8865e5e5c5204bb9
5 changes: 2 additions & 3 deletions script/mail_new_activity.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def story_subject(story, prefix = "")

mailing_list_users = User.where("mailing_list_mode > 0").select(&:is_active?)

last_story_id = (Keystore.value_for(LAST_STORY_KEY) || Story.last.id).to_i
last_story_id = (Keystore.value_for(LAST_STORY_KEY) || Story.last && Story.last.id).to_i

Story.where("id > ? AND is_expired = ?", last_story_id, false).order(:id).each do |s|
s.fetch_story_cache!
Expand Down Expand Up @@ -142,8 +142,7 @@ def story_subject(story, prefix = "")

# repeat for comments

last_comment_id = (Keystore.value_for(LAST_COMMENT_KEY) ||
Comment.last.id).to_i
last_comment_id = (Keystore.value_for(LAST_COMMENT_KEY) || Comment.last && Comment.last.id).to_i

Comment.where(
"id > ? AND (is_deleted = ? AND is_moderated = ?)",
Expand Down