Merge branch 'master' into escoger_idioma_803

Conflicts: app/controllers/application_controller.rb
2015-08-05 15:47:52 -05:00
parent a89d621d1d ca60d57c02
commit c4eb29f99d
51 changed files with 1195 additions and 2179 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -21,4 +21,9 @@ class ApplicationController < ActionController::Base

    I18n.locale = session[:locale]
  end
+
+  def verify_captcha?(resource)
+    return true unless recaptcha_keys?
+    verify_recaptcha(model: resource)
+  end
 end