Merge pull request #2619 from bennettscience/master

fixes redirect loop

app/controllers/users/omniauth_callbacks_controller.rb

@@ -35,8 +35,7 @@ module Users
         openid.save!
 
         sign_in user
-        redirect_to request.env['omniauth.origin'] || root_path,
-                    notice: "#{user.email} signed in successfully with #{provider}"
+        redirect_to root_path, notice: "#{user.email} signed in successfully with #{provider}"
       rescue => e
         flash[:error] = e.message
         redirect_back_or_to new_user_registration_path

app/views/proposals/show.html.haml

@@ -27,7 +27,7 @@
   .row
     .col-md-3
       %h3
-      - if event.speakers.any?
+      - if @event.speakers.any?
         Presented by:
         - @speakers_ordered.each do |speaker|
           .speakerinfo