From 7a2d945f581c8ce9e322883ec597366143fe10cb Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sat, 16 Feb 2019 13:22:26 -0500 Subject: Maybe this fixes the thing (updating gems) --- Gemfile.lock | 22 +++++++++++----------- db/schema.rb | 40 ++++++++++++++++++++-------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8e81049..8fccc7c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -61,7 +61,7 @@ GEM tzinfo (~> 1.1) acts-as-taggable-on (6.0.0) activerecord (~> 5.0) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) airbrussh (1.3.1) sshkit (>= 1.6.1, != 1.7.0) @@ -69,7 +69,7 @@ GEM bcrypt (3.1.12) bindex (0.5.0) builder (3.2.3) - byebug (10.0.2) + byebug (11.0.0) capistrano (3.11.0) airbrussh (>= 1.0.0) i18n @@ -107,7 +107,7 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.1.4) crass (1.0.4) - devise (4.5.0) + devise (4.6.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 6.0) @@ -123,8 +123,8 @@ GEM haml (5.0.4) temple (>= 0.8.0) tilt - highline (2.0.0) - i18n (1.5.2) + highline (2.0.1) + i18n (1.5.3) concurrent-ruby (~> 1.0) jbuilder (2.8.0) activesupport (>= 4.2.0) @@ -208,9 +208,9 @@ GEM rb-inotify (0.10.0) ffi (~> 1.0) ref (2.0.0) - responders (2.4.0) - actionpack (>= 4.2.0, < 5.3) - railties (>= 4.2.0, < 5.3) + responders (2.4.1) + actionpack (>= 4.2.0, < 6.0) + railties (>= 4.2.0, < 6.0) ruby_dep (1.5.0) rubyzip (1.2.2) sassc (2.0.0) @@ -240,8 +240,8 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.13) - sshkit (1.18.0) + sqlite3 (1.4.0) + sshkit (1.18.2) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) temple (0.8.0) @@ -314,4 +314,4 @@ DEPENDENCIES web-console (>= 3.3.0) BUNDLED WITH - 1.16.2 + 2.0.1 diff --git a/db/schema.rb b/db/schema.rb index 58891d3..93085f3 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,9 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180811215146) do +ActiveRecord::Schema.define(version: 2018_08_11_215146) do - create_table "blogs", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| + create_table "blogs", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t| t.string "title" t.text "body" t.string "slug" @@ -22,7 +22,7 @@ ActiveRecord::Schema.define(version: 20180811215146) do t.datetime "published_at" end - create_table "ckeditor_assets", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| + create_table "ckeditor_assets", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t| t.string "data_file_name", null: false t.string "data_content_type" t.integer "data_file_size" @@ -35,14 +35,14 @@ ActiveRecord::Schema.define(version: 20180811215146) do t.index ["type"], name: "index_ckeditor_assets_on_type" end - create_table "links", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci" do |t| + create_table "links", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci", force: :cascade do |t| t.string "title", null: false t.string "url", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false end - create_table "pokeviewer_abilities", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| + create_table "pokeviewer_abilities", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t| t.string "name", null: false t.string "description", null: false t.datetime "created_at", null: false @@ -50,13 +50,13 @@ ActiveRecord::Schema.define(version: 20180811215146) do t.index ["name"], name: "index_pokeviewer_abilities_on_name", unique: true end - create_table "pokeviewer_gift_ribbons", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| + create_table "pokeviewer_gift_ribbons", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t| t.string "description", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false end - create_table "pokeviewer_items", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| + create_table "pokeviewer_items", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t| t.string "name", null: false t.boolean "tm", default: false, null: false t.integer "move_id" @@ -68,13 +68,13 @@ ActiveRecord::Schema.define(version: 20180811215146) do t.index ["move_id"], name: "index_pokeviewer_items_on_move_id" end - create_table "pokeviewer_locations", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| + create_table "pokeviewer_locations", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t| t.string "name", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false end - create_table "pokeviewer_moves", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| + create_table "pokeviewer_moves", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t| t.string "name", null: false t.integer "pp", null: false t.datetime "created_at", null: false @@ -86,7 +86,7 @@ ActiveRecord::Schema.define(version: 20180811215146) do t.index ["name"], name: "index_pokeviewer_moves_on_name", unique: true end - create_table "pokeviewer_pokedex_entries", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| + create_table "pokeviewer_pokedex_entries", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t| t.bigint "trainer_id" t.bigint "species_id" t.boolean "caught", default: false @@ -97,7 +97,7 @@ ActiveRecord::Schema.define(version: 20180811215146) do t.index ["trainer_id"], name: "index_pokeviewer_pokedex_entries_on_trainer_id" end - create_table "pokeviewer_pokemon", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| + create_table "pokeviewer_pokemon", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t| t.string "uuid", null: false t.integer "trainer_id" t.string "key" @@ -124,7 +124,7 @@ ActiveRecord::Schema.define(version: 20180811215146) do t.index ["uuid"], name: "index_pokeviewer_pokemon_on_uuid", unique: true end - create_table "pokeviewer_revisions", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| + create_table "pokeviewer_revisions", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t| t.integer "pokemon_id", null: false t.integer "sequential_id", null: false t.string "nickname", null: false @@ -180,7 +180,7 @@ ActiveRecord::Schema.define(version: 20180811215146) do t.index ["species_id"], name: "index_pokeviewer_revisions_on_species_id" end - create_table "pokeviewer_species", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| + create_table "pokeviewer_species", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t| t.string "name", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false @@ -191,7 +191,7 @@ ActiveRecord::Schema.define(version: 20180811215146) do t.index ["name"], name: "index_pokeviewer_species_on_name", unique: true end - create_table "pokeviewer_trainers", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| + create_table "pokeviewer_trainers", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t| t.string "game", null: false t.string "name", null: false t.integer "number", null: false @@ -228,7 +228,7 @@ ActiveRecord::Schema.define(version: 20180811215146) do t.index ["world_ribbon_id"], name: "index_pokeviewer_trainers_on_world_ribbon_id" end - create_table "records", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| + create_table "records", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t| t.text "description" t.string "recordable_type" t.integer "recordable_id" @@ -237,7 +237,7 @@ ActiveRecord::Schema.define(version: 20180811215146) do t.index ["recordable_type", "recordable_id"], name: "index_records_on_recordable_type_and_recordable_id" end - create_table "streams", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci" do |t| + create_table "streams", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci", force: :cascade do |t| t.string "title" t.text "body" t.string "slug" @@ -245,7 +245,7 @@ ActiveRecord::Schema.define(version: 20180811215146) do t.datetime "updated_at", null: false end - create_table "taggings", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci" do |t| + create_table "taggings", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci", force: :cascade do |t| t.integer "tag_id" t.string "taggable_type" t.integer "taggable_id" @@ -264,13 +264,13 @@ ActiveRecord::Schema.define(version: 20180811215146) do t.index ["tagger_id"], name: "index_taggings_on_tagger_id" end - create_table "tags", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci" do |t| + create_table "tags", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci", force: :cascade do |t| t.string "name", limit: 255, collation: "utf8_bin" t.integer "taggings_count", default: 0 t.index ["name"], name: "index_tags_on_name", unique: true end - create_table "updates", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci" do |t| + create_table "updates", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci", force: :cascade do |t| t.bigint "stream_id" t.text "body" t.datetime "created_at", null: false @@ -278,7 +278,7 @@ ActiveRecord::Schema.define(version: 20180811215146) do t.index ["stream_id"], name: "index_updates_on_stream_id" end - create_table "users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| + create_table "users", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t| t.string "login", default: "", null: false t.string "email", default: "", null: false t.string "encrypted_password", default: "", null: false -- cgit 1.4.1