Merge with master

2017-09-28 13:36:20 +02:00
parent f67ba62c49 ea5a7af5fd
commit 92c774cdeb
183 changed files with 3101 additions and 1935 deletions
--- a/app/models/debate.rb
+++ b/app/models/debate.rb
@@ -95,7 +95,7 @@ class Debate < ActiveRecord::Base

  def register_vote(user, vote_value)
    if votable_by?(user)
-      Debate.increment_counter(:cached_anonymous_votes_total, id) if (user.unverified? && !user.voted_for?(self))
+      Debate.increment_counter(:cached_anonymous_votes_total, id) if user.unverified? && !user.voted_for?(self)
      vote_by(voter: user, vote: vote_value)
    end
  end