Merge branch 'remove-travel-schedule' into remove-schedule

* remove-travel-schedule:
  Remove travel schedule from registration
  Correct variable error
  fixes redirect loop
  add if condition to send booth rejection mail

app/controllers/admin/booths_controller.rb

@@ -92,7 +92,9 @@ module Admin
       @booth.reject!
 
       if @booth.save
-        Mailbot.conference_booths_rejection_mail(@booth).deliver_later
+        if @conference.email_settings.send_on_booths_rejection
+          Mailbot.conference_booths_rejection_mail(@booth).deliver_later
+        end
         redirect_to admin_conference_booths_path(conference_id: @conference.short_title),
                     notice: "#{(t'booth').capitalize} successfully rejected."
       else

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/conference_registrations/_form.html.haml

@@ -22,6 +22,7 @@
             = render partial: 'devise/shared/sign_up_form_embedded'
 
             = render partial: 'registration_info', locals: { f: f }
+            = f.input :conference_id, as: :hidden, value: @conference.id
             .row
               .col-md-12
                 %p.pull-right

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