gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 92d7fe73ae into 7e9d1dbf84

Browse source
This commit is contained in:
Sagarpreet Chadha 2017-10-01 19:01:11 +00:00 • committed by GitHub
commit 6fef10a5a6
5 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.byebug_history Normal file
View file

@ -0,0 +1 @@
c

2
app/pdfs/ticket_pdf.rb
View file

@ -51,7 +51,9 @@ class TicketPdf < Prawn::Document
move_down 70 move_down 70
draw_text @conference.title.to_s, at: [@mid_horizontal + 30, cursor - 30], size: 12 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 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] draw_text @conference.venue.name.to_s, at: [@mid_horizontal + 30, cursor - 70]
end
move_up 130 move_up 130
move_down @mid_vertical move_down @mid_vertical
end end

1
app/views/devise/confirmations/new.html.haml
View file

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

3
db/schema.rb
View file

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