fixes conflicts with master [#25]

app/controllers/application_controller.rb

@@ -7,4 +7,9 @@ class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
+
+  def verify_captcha?(resource)
+    return true unless recaptcha_keys?
+    verify_recaptcha(model: resource)
+  end
 end

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
@@ -25,7 +26,7 @@ class DebatesController < ApplicationController
   def create
     @debate = Debate.new(debate_params)
     @debate.author = current_user
-    if verify_captcha? and @debate.save
+    if verify_captcha?(@debate) and @debate.save
       redirect_to @debate, notice: t('flash.actions.create.notice', resource_name: 'Debate')
     else
       render :new
@@ -54,10 +55,4 @@ class DebatesController < ApplicationController
     def validate_ownership
       raise ActiveRecord::RecordNotFound unless @debate.editable_by?(current_user)
     end
-
-    def verify_captcha?
-      return true unless recaptcha_keys?
-      verify_recaptcha(model: @debate) 
-    end
-
 end

app/controllers/registrations_controller.rb

@@ -1,15 +1,16 @@
 class RegistrationsController < Devise::RegistrationsController
+  include RecaptchaHelper
 
   def create
-    if verify_recaptcha
+    if verify_captcha?(resource)
       super
     else
       build_resource(sign_up_params)
       flash.now[:alert] = t('recaptcha.errors.verification_failed')
       render :new
-    end  
+    end
   end
-  
+
 
   private