upgraded rails to 4.2 and dependencies. except rubocop

This commit is contained in:
raluka 2015-11-05 16:07:14 +01:00
parent 28e55f3f50
commit 48db99389e
16 changed files with 407 additions and 293 deletions

View file

@ -14,8 +14,8 @@
ActiveRecord::Schema.define(version: 20151005161518) do
create_table "ahoy_events", force: true do |t|
t.uuid "visit_id"
create_table "ahoy_events", force: :cascade do |t|
t.uuid "visit_id", limit: 16
t.integer "user_id"
t.string "name"
t.text "properties"
@ -26,13 +26,13 @@ ActiveRecord::Schema.define(version: 20151005161518) do
add_index "ahoy_events", ["user_id"], name: "index_ahoy_events_on_user_id"
add_index "ahoy_events", ["visit_id"], name: "index_ahoy_events_on_visit_id"
create_table "answers", force: true do |t|
create_table "answers", force: :cascade do |t|
t.string "title"
t.datetime "created_at"
t.datetime "updated_at"
end
create_table "call_for_papers", force: true do |t|
create_table "call_for_papers", force: :cascade do |t|
t.date "start_date", null: false
t.date "end_date", null: false
t.integer "conference_id"
@ -43,7 +43,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.boolean "schedule_public"
end
create_table "campaigns", force: true do |t|
create_table "campaigns", force: :cascade do |t|
t.integer "conference_id"
t.string "name"
t.string "utm_source"
@ -55,7 +55,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.datetime "updated_at"
end
create_table "comments", force: true do |t|
create_table "comments", force: :cascade do |t|
t.string "title", limit: 50, default: ""
t.text "body"
t.integer "commentable_id"
@ -73,7 +73,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
add_index "comments", ["commentable_type"], name: "index_comments_on_commentable_type"
add_index "comments", ["user_id"], name: "index_comments_on_user_id"
create_table "commercials", force: true do |t|
create_table "commercials", force: :cascade do |t|
t.string "commercial_id"
t.string "commercial_type"
t.integer "commercialable_id"
@ -83,7 +83,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.string "url"
end
create_table "conferences", force: true do |t|
create_table "conferences", force: :cascade do |t|
t.string "guid", null: false
t.string "title", null: false
t.string "short_title", null: false
@ -108,12 +108,12 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.text "description"
end
create_table "conferences_questions", id: false, force: true do |t|
create_table "conferences_questions", id: false, force: :cascade do |t|
t.integer "conference_id"
t.integer "question_id"
end
create_table "contacts", force: true do |t|
create_table "contacts", force: :cascade do |t|
t.string "social_tag"
t.string "email"
t.string "facebook"
@ -126,7 +126,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.string "sponsor_email"
end
create_table "delayed_jobs", force: true do |t|
create_table "delayed_jobs", force: :cascade do |t|
t.integer "priority", default: 0, null: false
t.integer "attempts", default: 0, null: false
t.text "handler", null: false
@ -142,14 +142,14 @@ ActiveRecord::Schema.define(version: 20151005161518) do
add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority"
create_table "dietary_choices", force: true do |t|
create_table "dietary_choices", force: :cascade do |t|
t.integer "conference_id"
t.string "title", null: false
t.datetime "created_at"
t.datetime "updated_at"
end
create_table "difficulty_levels", force: true do |t|
create_table "difficulty_levels", force: :cascade do |t|
t.integer "conference_id"
t.string "title"
t.text "description"
@ -158,7 +158,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.datetime "updated_at"
end
create_table "email_settings", force: true do |t|
create_table "email_settings", force: :cascade do |t|
t.integer "conference_id"
t.boolean "send_on_registration", default: false
t.boolean "send_on_accepted", default: false
@ -191,7 +191,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.text "call_for_papers_dates_updated_body"
end
create_table "event_types", force: true do |t|
create_table "event_types", force: :cascade do |t|
t.integer "conference_id"
t.string "title", null: false
t.integer "length", default: 30
@ -201,7 +201,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.string "description"
end
create_table "event_users", force: true do |t|
create_table "event_users", force: :cascade do |t|
t.integer "user_id"
t.integer "event_id"
t.string "event_role", default: "participant", null: false
@ -210,7 +210,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.datetime "updated_at"
end
create_table "events", force: true do |t|
create_table "events", force: :cascade do |t|
t.string "guid", null: false
t.integer "conference_id"
t.integer "event_type_id"
@ -239,12 +239,12 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.boolean "is_highlight", default: false
end
create_table "events_registrations", id: false, force: true do |t|
create_table "events_registrations", id: false, force: :cascade do |t|
t.integer "registration_id"
t.integer "event_id"
end
create_table "lodgings", force: true do |t|
create_table "lodgings", force: :cascade do |t|
t.string "name"
t.text "description"
t.string "photo_file_name"
@ -257,7 +257,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.integer "conference_id"
end
create_table "openids", force: true do |t|
create_table "openids", force: :cascade do |t|
t.string "provider"
t.string "email"
t.string "uid"
@ -266,7 +266,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.datetime "updated_at"
end
create_table "photos", force: true do |t|
create_table "photos", force: :cascade do |t|
t.text "description"
t.string "picture_file_name"
t.string "picture_content_type"
@ -277,25 +277,25 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.datetime "updated_at"
end
create_table "qanswers", force: true do |t|
create_table "qanswers", force: :cascade do |t|
t.integer "question_id"
t.integer "answer_id"
t.datetime "created_at"
t.datetime "updated_at"
end
create_table "qanswers_registrations", id: false, force: true do |t|
create_table "qanswers_registrations", id: false, force: :cascade do |t|
t.integer "registration_id", null: false
t.integer "qanswer_id", null: false
end
create_table "question_types", force: true do |t|
create_table "question_types", force: :cascade do |t|
t.string "title"
t.datetime "created_at"
t.datetime "updated_at"
end
create_table "questions", force: true do |t|
create_table "questions", force: :cascade do |t|
t.string "title"
t.integer "question_type_id"
t.integer "conference_id"
@ -304,7 +304,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.datetime "updated_at"
end
create_table "registration_periods", force: true do |t|
create_table "registration_periods", force: :cascade do |t|
t.integer "conference_id"
t.date "start_date"
t.date "end_date"
@ -312,7 +312,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.datetime "updated_at"
end
create_table "registrations", force: true do |t|
create_table "registrations", force: :cascade do |t|
t.integer "conference_id"
t.datetime "arrival"
t.datetime "departure"
@ -327,17 +327,17 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.integer "week"
end
create_table "registrations_social_events", id: false, force: true do |t|
create_table "registrations_social_events", id: false, force: :cascade do |t|
t.integer "registration_id"
t.integer "social_event_id"
end
create_table "registrations_vchoices", id: false, force: true do |t|
create_table "registrations_vchoices", id: false, force: :cascade do |t|
t.integer "registration_id"
t.integer "vchoice_id"
end
create_table "roles", force: true do |t|
create_table "roles", force: :cascade do |t|
t.string "name"
t.datetime "created_at"
t.datetime "updated_at"
@ -349,28 +349,28 @@ ActiveRecord::Schema.define(version: 20151005161518) do
add_index "roles", ["name", "resource_type", "resource_id"], name: "index_roles_on_name_and_resource_type_and_resource_id"
add_index "roles", ["name"], name: "index_roles_on_name"
create_table "roles_users", id: false, force: true do |t|
create_table "roles_users", id: false, force: :cascade do |t|
t.integer "role_id"
t.integer "user_id"
end
add_index "roles_users", ["user_id", "role_id"], name: "index_roles_users_on_user_id_and_role_id"
create_table "rooms", force: true do |t|
create_table "rooms", force: :cascade do |t|
t.string "guid", null: false
t.integer "conference_id"
t.string "name", null: false
t.integer "size"
end
create_table "social_events", force: true do |t|
create_table "social_events", force: :cascade do |t|
t.integer "conference_id"
t.string "title"
t.text "description"
t.date "date"
end
create_table "splashpages", force: true do |t|
create_table "splashpages", force: :cascade do |t|
t.integer "conference_id"
t.boolean "public"
t.boolean "include_tracks"
@ -386,7 +386,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.boolean "include_cfp", default: false
end
create_table "sponsors", force: true do |t|
create_table "sponsors", force: :cascade do |t|
t.string "name"
t.text "description"
t.string "website_url"
@ -400,7 +400,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.datetime "updated_at"
end
create_table "sponsorship_levels", force: true do |t|
create_table "sponsorship_levels", force: :cascade do |t|
t.string "title"
t.integer "conference_id"
t.datetime "created_at"
@ -408,14 +408,14 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.integer "position"
end
create_table "subscriptions", force: true do |t|
create_table "subscriptions", force: :cascade do |t|
t.integer "user_id"
t.integer "conference_id"
t.datetime "created_at"
t.datetime "updated_at"
end
create_table "targets", force: true do |t|
create_table "targets", force: :cascade do |t|
t.integer "conference_id"
t.integer "campaign_id"
t.date "due_date"
@ -425,7 +425,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.datetime "updated_at"
end
create_table "ticket_purchases", force: true do |t|
create_table "ticket_purchases", force: :cascade do |t|
t.integer "ticket_id"
t.integer "conference_id"
t.boolean "paid", default: false
@ -434,7 +434,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.integer "user_id"
end
create_table "tickets", force: true do |t|
create_table "tickets", force: :cascade do |t|
t.integer "conference_id"
t.string "title", null: false
t.text "description"
@ -442,7 +442,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.string "price_currency", default: "USD", null: false
end
create_table "tracks", force: true do |t|
create_table "tracks", force: :cascade do |t|
t.string "guid", null: false
t.integer "conference_id"
t.string "name", null: false
@ -452,7 +452,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.datetime "updated_at"
end
create_table "users", force: true do |t|
create_table "users", force: :cascade do |t|
t.string "email", default: "", null: false
t.string "encrypted_password", default: "", null: false
t.string "reset_password_token"
@ -492,12 +492,12 @@ ActiveRecord::Schema.define(version: 20151005161518) do
add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
add_index "users", ["username"], name: "index_users_on_username", unique: true
create_table "vchoices", force: true do |t|
create_table "vchoices", force: :cascade do |t|
t.integer "vday_id"
t.integer "vposition_id"
end
create_table "vdays", force: true do |t|
create_table "vdays", force: :cascade do |t|
t.integer "conference_id"
t.date "day"
t.text "description"
@ -505,7 +505,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.datetime "updated_at"
end
create_table "venues", force: true do |t|
create_table "venues", force: :cascade do |t|
t.string "guid"
t.string "name"
t.string "website"
@ -525,7 +525,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.integer "conference_id"
end
create_table "versions", force: true do |t|
create_table "versions", force: :cascade do |t|
t.string "item_type", null: false
t.integer "item_id", null: false
t.string "event", null: false
@ -537,8 +537,8 @@ ActiveRecord::Schema.define(version: 20151005161518) do
add_index "versions", ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
create_table "visits", force: true do |t|
t.uuid "visitor_id"
create_table "visits", force: :cascade do |t|
t.uuid "visitor_id", limit: 16
t.string "ip"
t.text "user_agent"
t.text "referrer"
@ -562,7 +562,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
add_index "visits", ["user_id"], name: "index_visits_on_user_id"
create_table "votes", force: true do |t|
create_table "votes", force: :cascade do |t|
t.integer "event_id"
t.integer "rating"
t.datetime "created_at"
@ -570,7 +570,7 @@ ActiveRecord::Schema.define(version: 20151005161518) do
t.integer "user_id"
end
create_table "vpositions", force: true do |t|
create_table "vpositions", force: :cascade do |t|
t.integer "conference_id"
t.string "title", null: false
t.text "description"