Merge 92d7fe73ae into 7e9d1dbf84

.byebug_history

@@ -0,0 +1 @@
+c

app/controllers/application_controller.rb

@@ -7,7 +7,7 @@ class ApplicationController < ActionController::Base
   before_filter :store_location
   # Ensure every controller authorizes resource or skips authorization (skip_authorization_check)
   check_authorization unless: :devise_controller?
-
+  
   def store_location
     # store last url - this is needed for post-login redirect to whatever the user last visited.
     return unless request.get?

app/pdfs/ticket_pdf.rb

@@ -51,7 +51,9 @@ class TicketPdf < Prawn::Document
     move_down 70
     draw_text @conference.title.to_s, at: [@mid_horizontal + 30, cursor - 30], size: 12
     draw_text @conference.organization.name.to_s, at: [@mid_horizontal + 30, cursor - 50], size: 12
+    if @conference.venue != nil
     draw_text @conference.venue.name.to_s, at: [@mid_horizontal + 30, cursor - 70]
+    end
     move_up 130
     move_down @mid_vertical
   end

app/views/devise/confirmations/new.html.haml

@@ -12,3 +12,4 @@
               = f.action :submit, as: :button, label: 'Submit', button_html: { class: 'btn btn-success' }
 
           = render partial: 'devise/shared/help'
+       

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170816203325) do
+ActiveRecord::Schema.define(version: 20170814174637) do
 
   create_table "ahoy_events", force: :cascade do |t|
     t.uuid     "visit_id",   limit: 16
@@ -577,7 +577,6 @@ ActiveRecord::Schema.define(version: 20170816203325) do
     t.boolean  "is_admin",               default: false
     t.string   "username"
     t.boolean  "is_disabled",            default: false
-    t.string   "token"
   end
 
   add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true