about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--Gemfile.lock22
-rw-r--r--db/schema.rb40
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
61 tzinfo (~> 1.1) 61 tzinfo (~> 1.1)
62 acts-as-taggable-on (6.0.0) 62 acts-as-taggable-on (6.0.0)
63 activerecord (~> 5.0) 63 activerecord (~> 5.0)
64 addressable (2.5.2) 64 addressable (2.6.0)
65 public_suffix (>= 2.0.2, < 4.0) 65 public_suffix (>= 2.0.2, < 4.0)
66 airbrussh (1.3.1) 66 airbrussh (1.3.1)
67 sshkit (>= 1.6.1, != 1.7.0) 67 sshkit (>= 1.6.1, != 1.7.0)
@@ -69,7 +69,7 @@ GEM
69 bcrypt (3.1.12) 69 bcrypt (3.1.12)
70 bindex (0.5.0) 70 bindex (0.5.0)
71 builder (3.2.3) 71 builder (3.2.3)
72 byebug (10.0.2) 72 byebug (11.0.0)
73 capistrano (3.11.0) 73 capistrano (3.11.0)
74 airbrussh (>= 1.0.0) 74 airbrussh (>= 1.0.0)
75 i18n 75 i18n
@@ -107,7 +107,7 @@ GEM
107 coffee-script-source (1.12.2) 107 coffee-script-source (1.12.2)
108 concurrent-ruby (1.1.4) 108 concurrent-ruby (1.1.4)
109 crass (1.0.4) 109 crass (1.0.4)
110 devise (4.5.0) 110 devise (4.6.1)
111 bcrypt (~> 3.0) 111 bcrypt (~> 3.0)
112 orm_adapter (~> 0.1) 112 orm_adapter (~> 0.1)
113 railties (>= 4.1.0, < 6.0) 113 railties (>= 4.1.0, < 6.0)
@@ -123,8 +123,8 @@ GEM
123 haml (5.0.4) 123 haml (5.0.4)
124 temple (>= 0.8.0) 124 temple (>= 0.8.0)
125 tilt 125 tilt
126 highline (2.0.0) 126 highline (2.0.1)
127 i18n (1.5.2) 127 i18n (1.5.3)
128 concurrent-ruby (~> 1.0) 128 concurrent-ruby (~> 1.0)
129 jbuilder (2.8.0) 129 jbuilder (2.8.0)
130 activesupport (>= 4.2.0) 130 activesupport (>= 4.2.0)
@@ -208,9 +208,9 @@ GEM
208 rb-inotify (0.10.0) 208 rb-inotify (0.10.0)
209 ffi (~> 1.0) 209 ffi (~> 1.0)
210 ref (2.0.0) 210 ref (2.0.0)
211 responders (2.4.0) 211 responders (2.4.1)
212 actionpack (>= 4.2.0, < 5.3) 212 actionpack (>= 4.2.0, < 6.0)
213 railties (>= 4.2.0, < 5.3) 213 railties (>= 4.2.0, < 6.0)
214 ruby_dep (1.5.0) 214 ruby_dep (1.5.0)
215 rubyzip (1.2.2) 215 rubyzip (1.2.2)
216 sassc (2.0.0) 216 sassc (2.0.0)
@@ -240,8 +240,8 @@ GEM
240 actionpack (>= 4.0) 240 actionpack (>= 4.0)
241 activesupport (>= 4.0) 241 activesupport (>= 4.0)
242 sprockets (>= 3.0.0) 242 sprockets (>= 3.0.0)
243 sqlite3 (1.3.13) 243 sqlite3 (1.4.0)
244 sshkit (1.18.0) 244 sshkit (1.18.2)
245 net-scp (>= 1.1.2) 245 net-scp (>= 1.1.2)
246 net-ssh (>= 2.8.0) 246 net-ssh (>= 2.8.0)
247 temple (0.8.0) 247 temple (0.8.0)
@@ -314,4 +314,4 @@ DEPENDENCIES
314 web-console (>= 3.3.0) 314 web-console (>= 3.3.0)
315 315
316BUNDLED WITH 316BUNDLED WITH
317 1.16.2 317 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 @@
10# 10#
11# It's strongly recommended that you check this file into your version control system. 11# It's strongly recommended that you check this file into your version control system.
12 12
13ActiveRecord::Schema.define(version: 20180811215146) do 13ActiveRecord::Schema.define(version: 2018_08_11_215146) do
14 14
15 create_table "blogs", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| 15 create_table "blogs", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t|
16 t.string "title" 16 t.string "title"
17 t.text "body" 17 t.text "body"
18 t.string "slug" 18 t.string "slug"
@@ -22,7 +22,7 @@ ActiveRecord::Schema.define(version: 20180811215146) do
22 t.datetime "published_at" 22 t.datetime "published_at"
23 end 23 end
24 24
25 create_table "ckeditor_assets", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| 25 create_table "ckeditor_assets", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t|
26 t.string "data_file_name", null: false 26 t.string "data_file_name", null: false
27 t.string "data_content_type" 27 t.string "data_content_type"
28 t.integer "data_file_size" 28 t.integer "data_file_size"
@@ -35,14 +35,14 @@ ActiveRecord::Schema.define(version: 20180811215146) do
35 t.index ["type"], name: "index_ckeditor_assets_on_type" 35 t.index ["type"], name: "index_ckeditor_assets_on_type"
36 end 36 end
37 37
38 create_table "links", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci" do |t| 38 create_table "links", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci", force: :cascade do |t|
39 t.string "title", null: false 39 t.string "title", null: false
40 t.string "url", null: false 40 t.string "url", null: false
41 t.datetime "created_at", null: false 41 t.datetime "created_at", null: false
42 t.datetime "updated_at", null: false 42 t.datetime "updated_at", null: false
43 end 43 end
44 44
45 create_table "pokeviewer_abilities", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| 45 create_table "pokeviewer_abilities", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t|
46 t.string "name", null: false 46 t.string "name", null: false
47 t.string "description", null: false 47 t.string "description", null: false
48 t.datetime "created_at", null: false 48 t.datetime "created_at", null: false
@@ -50,13 +50,13 @@ ActiveRecord::Schema.define(version: 20180811215146) do
50 t.index ["name"], name: "index_pokeviewer_abilities_on_name", unique: true 50 t.index ["name"], name: "index_pokeviewer_abilities_on_name", unique: true
51 end 51 end
52 52
53 create_table "pokeviewer_gift_ribbons", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| 53 create_table "pokeviewer_gift_ribbons", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t|
54 t.string "description", null: false 54 t.string "description", null: false
55 t.datetime "created_at", null: false 55 t.datetime "created_at", null: false
56 t.datetime "updated_at", null: false 56 t.datetime "updated_at", null: false
57 end 57 end
58 58
59 create_table "pokeviewer_items", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| 59 create_table "pokeviewer_items", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t|
60 t.string "name", null: false 60 t.string "name", null: false
61 t.boolean "tm", default: false, null: false 61 t.boolean "tm", default: false, null: false
62 t.integer "move_id" 62 t.integer "move_id"
@@ -68,13 +68,13 @@ ActiveRecord::Schema.define(version: 20180811215146) do
68 t.index ["move_id"], name: "index_pokeviewer_items_on_move_id" 68 t.index ["move_id"], name: "index_pokeviewer_items_on_move_id"
69 end 69 end
70 70
71 create_table "pokeviewer_locations", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| 71 create_table "pokeviewer_locations", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t|
72 t.string "name", null: false 72 t.string "name", null: false
73 t.datetime "created_at", null: false 73 t.datetime "created_at", null: false
74 t.datetime "updated_at", null: false 74 t.datetime "updated_at", null: false
75 end 75 end
76 76
77 create_table "pokeviewer_moves", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| 77 create_table "pokeviewer_moves", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t|
78 t.string "name", null: false 78 t.string "name", null: false
79 t.integer "pp", null: false 79 t.integer "pp", null: false
80 t.datetime "created_at", null: false 80 t.datetime "created_at", null: false
@@ -86,7 +86,7 @@ ActiveRecord::Schema.define(version: 20180811215146) do
86 t.index ["name"], name: "index_pokeviewer_moves_on_name", unique: true 86 t.index ["name"], name: "index_pokeviewer_moves_on_name", unique: true
87 end 87 end
88 88
89 create_table "pokeviewer_pokedex_entries", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| 89 create_table "pokeviewer_pokedex_entries", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t|
90 t.bigint "trainer_id" 90 t.bigint "trainer_id"
91 t.bigint "species_id" 91 t.bigint "species_id"
92 t.boolean "caught", default: false 92 t.boolean "caught", default: false
@@ -97,7 +97,7 @@ ActiveRecord::Schema.define(version: 20180811215146) do
97 t.index ["trainer_id"], name: "index_pokeviewer_pokedex_entries_on_trainer_id" 97 t.index ["trainer_id"], name: "index_pokeviewer_pokedex_entries_on_trainer_id"
98 end 98 end
99 99
100 create_table "pokeviewer_pokemon", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| 100 create_table "pokeviewer_pokemon", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t|
101 t.string "uuid", null: false 101 t.string "uuid", null: false
102 t.integer "trainer_id" 102 t.integer "trainer_id"
103 t.string "key" 103 t.string "key"
@@ -124,7 +124,7 @@ ActiveRecord::Schema.define(version: 20180811215146) do
124 t.index ["uuid"], name: "index_pokeviewer_pokemon_on_uuid", unique: true 124 t.index ["uuid"], name: "index_pokeviewer_pokemon_on_uuid", unique: true
125 end 125 end
126 126
127 create_table "pokeviewer_revisions", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| 127 create_table "pokeviewer_revisions", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t|
128 t.integer "pokemon_id", null: false 128 t.integer "pokemon_id", null: false
129 t.integer "sequential_id", null: false 129 t.integer "sequential_id", null: false
130 t.string "nickname", null: false 130 t.string "nickname", null: false
@@ -180,7 +180,7 @@ ActiveRecord::Schema.define(version: 20180811215146) do
180 t.index ["species_id"], name: "index_pokeviewer_revisions_on_species_id" 180 t.index ["species_id"], name: "index_pokeviewer_revisions_on_species_id"
181 end 181 end
182 182
183 create_table "pokeviewer_species", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| 183 create_table "pokeviewer_species", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t|
184 t.string "name", null: false 184 t.string "name", null: false
185 t.datetime "created_at", null: false 185 t.datetime "created_at", null: false
186 t.datetime "updated_at", null: false 186 t.datetime "updated_at", null: false
@@ -191,7 +191,7 @@ ActiveRecord::Schema.define(version: 20180811215146) do
191 t.index ["name"], name: "index_pokeviewer_species_on_name", unique: true 191 t.index ["name"], name: "index_pokeviewer_species_on_name", unique: true
192 end 192 end
193 193
194 create_table "pokeviewer_trainers", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| 194 create_table "pokeviewer_trainers", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t|
195 t.string "game", null: false 195 t.string "game", null: false
196 t.string "name", null: false 196 t.string "name", null: false
197 t.integer "number", null: false 197 t.integer "number", null: false
@@ -228,7 +228,7 @@ ActiveRecord::Schema.define(version: 20180811215146) do
228 t.index ["world_ribbon_id"], name: "index_pokeviewer_trainers_on_world_ribbon_id" 228 t.index ["world_ribbon_id"], name: "index_pokeviewer_trainers_on_world_ribbon_id"
229 end 229 end
230 230
231 create_table "records", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| 231 create_table "records", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t|
232 t.text "description" 232 t.text "description"
233 t.string "recordable_type" 233 t.string "recordable_type"
234 t.integer "recordable_id" 234 t.integer "recordable_id"
@@ -237,7 +237,7 @@ ActiveRecord::Schema.define(version: 20180811215146) do
237 t.index ["recordable_type", "recordable_id"], name: "index_records_on_recordable_type_and_recordable_id" 237 t.index ["recordable_type", "recordable_id"], name: "index_records_on_recordable_type_and_recordable_id"
238 end 238 end
239 239
240 create_table "streams", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci" do |t| 240 create_table "streams", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci", force: :cascade do |t|
241 t.string "title" 241 t.string "title"
242 t.text "body" 242 t.text "body"
243 t.string "slug" 243 t.string "slug"
@@ -245,7 +245,7 @@ ActiveRecord::Schema.define(version: 20180811215146) do
245 t.datetime "updated_at", null: false 245 t.datetime "updated_at", null: false
246 end 246 end
247 247
248 create_table "taggings", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci" do |t| 248 create_table "taggings", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci", force: :cascade do |t|
249 t.integer "tag_id" 249 t.integer "tag_id"
250 t.string "taggable_type" 250 t.string "taggable_type"
251 t.integer "taggable_id" 251 t.integer "taggable_id"
@@ -264,13 +264,13 @@ ActiveRecord::Schema.define(version: 20180811215146) do
264 t.index ["tagger_id"], name: "index_taggings_on_tagger_id" 264 t.index ["tagger_id"], name: "index_taggings_on_tagger_id"
265 end 265 end
266 266
267 create_table "tags", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci" do |t| 267 create_table "tags", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci", force: :cascade do |t|
268 t.string "name", limit: 255, collation: "utf8_bin" 268 t.string "name", limit: 255, collation: "utf8_bin"
269 t.integer "taggings_count", default: 0 269 t.integer "taggings_count", default: 0
270 t.index ["name"], name: "index_tags_on_name", unique: true 270 t.index ["name"], name: "index_tags_on_name", unique: true
271 end 271 end
272 272
273 create_table "updates", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci" do |t| 273 create_table "updates", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci", force: :cascade do |t|
274 t.bigint "stream_id" 274 t.bigint "stream_id"
275 t.text "body" 275 t.text "body"
276 t.datetime "created_at", null: false 276 t.datetime "created_at", null: false
@@ -278,7 +278,7 @@ ActiveRecord::Schema.define(version: 20180811215146) do
278 t.index ["stream_id"], name: "index_updates_on_stream_id" 278 t.index ["stream_id"], name: "index_updates_on_stream_id"
279 end 279 end
280 280
281 create_table "users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin" do |t| 281 create_table "users", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", force: :cascade do |t|
282 t.string "login", default: "", null: false 282 t.string "login", default: "", null: false
283 t.string "email", default: "", null: false 283 t.string "email", default: "", null: false
284 t.string "encrypted_password", default: "", null: false 284 t.string "encrypted_password", default: "", null: false