merges master and fixes conflicts

2015-08-05 12:07:54 +02:00
parent 823426bfde 4ddaaeae6c
commit d7a9f05cc5
27 changed files with 805 additions and 2071 deletions
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -6,10 +6,11 @@ class DebatesController < ApplicationController

  def index
    if params[:tag]
-      @debates = Debate.tagged_with(params[:tag])
+      @debates = Debate.tagged_with(params[:tag]).order("created_at DESC")
    else
-      @debates = Debate.all
+      @debates = Debate.all.order("created_at DESC")
    end
+    @featured_debates = @debates.to_a.shift(3)
  end

  def show
@@ -51,4 +52,9 @@ class DebatesController < ApplicationController
      raise ActiveRecord::RecordNotFound unless @debate.editable_by?(current_user)
    end

+    def verify_captcha?
+      return true unless recaptcha_keys?
+      verify_recaptcha(model: @debate)
+    end
+
 end