gothinkster · garrettogrady · Oct 30, 2018
diff --git a/Gemfile b/Gemfile
@@ -17,7 +17,7 @@ gem 'sdoc', '~> 0.4.0', group: :doc
 
 gem 'acts-as-taggable-on', git: 'https://github.com/mbleigh/acts-as-taggable-on'
 gem 'acts_as_follower'
-gem 'devise', git: 'https://github.com/gogovan/devise.git', branch: 'rails-5.1'
+gem 'devise'
 gem 'jwt', '~> 1.5.4'
 gem 'puma'
 gem 'rack-cors', '~> 0.4.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,15 +1,3 @@
-GIT
-  remote: https://github.com/gogovan/devise.git
-  revision: 931ae3985872ea1f0039cd3a749779c0023a622a
-  branch: rails-5.1
-  specs:
-    devise (4.2.0)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.2)
-      responders
-      warden (~> 1.2.3)
-
 GIT
   remote: https://github.com/mbleigh/acts-as-taggable-on
   revision: 9bb57384398cd3e198c893b0345c7b26e3b5ad5e
@@ -60,11 +48,17 @@ GEM
     acts_as_follower (0.2.1)
     arel (8.0.0)
     ast (2.3.0)
-    bcrypt (3.1.11)
+    bcrypt (3.1.12)
     builder (3.2.3)
     byebug (9.0.6)
     coderay (1.1.1)
     concurrent-ruby (1.0.5)
+    devise (4.5.0)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0, < 6.0)
+      responders
+      warden (~> 1.2.3)
     erubi (1.6.0)
     ffi (1.9.18)
     globalid (0.4.0)
@@ -179,7 +173,7 @@ DEPENDENCIES
   acts-as-taggable-on!
   acts_as_follower
   byebug
-  devise!
+  devise
   jbuilder (~> 2.0)
   jwt (~> 1.5.4)
   listen
@@ -196,4 +190,4 @@ RUBY VERSION
    ruby 2.4.0p0
 
 BUNDLED WITH
-   1.14.6
+   1.17.1
diff --git a/README.md b/README.md
diff --git a/README.rdoc b/README.rdoc
diff --git a/Rakefile b/Rakefile
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
diff --git a/app/controllers/articles_controller.rb b/app/controllers/articles_controller.rb
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep
diff --git a/app/controllers/favorites_controller.rb b/app/controllers/favorites_controller.rb
diff --git a/app/controllers/follows_controller.rb b/app/controllers/follows_controller.rb
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
diff --git a/app/mailers/.keep b/app/mailers/.keep
diff --git a/app/models/.keep b/app/models/.keep
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
diff --git a/app/models/article.rb b/app/models/article.rb
diff --git a/app/models/comment.rb b/app/models/comment.rb
diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep
diff --git a/app/models/favorite.rb b/app/models/favorite.rb
diff --git a/app/models/follow.rb b/app/models/follow.rb
diff --git a/app/models/user.rb b/app/models/user.rb
diff --git a/app/views/articles/_article.json.jbuilder b/app/views/articles/_article.json.jbuilder
diff --git a/app/views/articles/index.json.jbuilder b/app/views/articles/index.json.jbuilder
diff --git a/app/views/articles/show.json.jbuilder b/app/views/articles/show.json.jbuilder
diff --git a/app/views/comments/_comment.json.jbuilder b/app/views/comments/_comment.json.jbuilder
diff --git a/app/views/comments/create.json.jbuilder b/app/views/comments/create.json.jbuilder
diff --git a/app/views/comments/index.json.jbuilder b/app/views/comments/index.json.jbuilder
diff --git a/app/views/devise/registrations/create.json.jbuilder b/app/views/devise/registrations/create.json.jbuilder
diff --git a/app/views/devise/sessions/create.json.jbuilder b/app/views/devise/sessions/create.json.jbuilder
diff --git a/app/views/profiles/_profile.json.jbuilder b/app/views/profiles/_profile.json.jbuilder
diff --git a/app/views/profiles/show.json.jbuilder b/app/views/profiles/show.json.jbuilder
diff --git a/app/views/users/_user.json.jbuilder b/app/views/users/_user.json.jbuilder
diff --git a/app/views/users/show.json.jbuilder b/app/views/users/show.json.jbuilder
diff --git a/config.ru b/config.ru
diff --git a/config/application.rb b/config/application.rb
diff --git a/config/boot.rb b/config/boot.rb
diff --git a/config/database.yml b/config/database.yml
diff --git a/config/environment.rb b/config/environment.rb
diff --git a/config/environments/development.rb b/config/environments/development.rb
diff --git a/config/environments/production.rb b/config/environments/production.rb
diff --git a/config/environments/test.rb b/config/environments/test.rb
diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
diff --git a/config/initializers/jbuilder.rb b/config/initializers/jbuilder.rb
diff --git a/config/initializers/json_param_key_transform.rb b/config/initializers/json_param_key_transform.rb
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
diff --git a/config/initializers/new_framework_defaults_5_1.rb b/config/initializers/new_framework_defaults_5_1.rb
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
diff --git a/config/locales/responders.en.yml b/config/locales/responders.en.yml
diff --git a/config/puma.rb b/config/puma.rb
diff --git a/config/routes.rb b/config/routes.rb
diff --git a/config/secrets.yml b/config/secrets.yml
diff --git a/config/secrets.yml.enc b/config/secrets.yml.enc
diff --git a/config/spring.rb b/config/spring.rb
diff --git a/db/migrate/20160712045707_devise_create_users.rb b/db/migrate/20160712045707_devise_create_users.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class DeviseCreateUsers < ActiveRecord::Migration
+class DeviseCreateUsers < ActiveRecord::Migration[5.1]
   def change
     create_table :users do |t|
       ## Database authenticatable

diff --git a/db/migrate/20160712045739_add_profile_fields_to_users.rb b/db/migrate/20160712045739_add_profile_fields_to_users.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddProfileFieldsToUsers < ActiveRecord::Migration
+class AddProfileFieldsToUsers < ActiveRecord::Migration[5.1]
   def change
     add_column :users, :username, :string
     add_index :users, :username, unique: true

diff --git a/db/migrate/20160712052128_create_articles.rb b/db/migrate/20160712052128_create_articles.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateArticles < ActiveRecord::Migration
+class CreateArticles < ActiveRecord::Migration[5.1]
   def change
     create_table :articles do |t|
       t.string :title

diff --git a/db/migrate/20160712054809_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb b/db/migrate/20160712054809_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # This migration comes from acts_as_taggable_on_engine (originally 1)
-class ActsAsTaggableOnMigration < ActiveRecord::Migration
+class ActsAsTaggableOnMigration < ActiveRecord::Migration[5.1]
   def self.up
     create_table :tags do |t|
       t.string :name
@@ -22,7 +22,6 @@ def self.up
       t.datetime :created_at
     end
 
-    add_index :taggings, :tag_id
     add_index :taggings, %i[taggable_id taggable_type context]
   end
 

diff --git a/db/migrate/20160712054810_add_missing_unique_indices.acts_as_taggable_on_engine.rb b/db/migrate/20160712054810_add_missing_unique_indices.acts_as_taggable_on_engine.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # This migration comes from acts_as_taggable_on_engine (originally 2)
-class AddMissingUniqueIndices < ActiveRecord::Migration
+class AddMissingUniqueIndices < ActiveRecord::Migration[5.1]
   def self.up
     add_index :tags, :name, unique: true
 

diff --git a/db/migrate/20160712054811_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb b/db/migrate/20160712054811_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # This migration comes from acts_as_taggable_on_engine (originally 3)
-class AddTaggingsCounterCacheToTags < ActiveRecord::Migration
+class AddTaggingsCounterCacheToTags < ActiveRecord::Migration[5.1]
   def self.up
     add_column :tags, :taggings_count, :integer, default: 0
 

diff --git a/db/migrate/20160712054812_add_missing_taggable_index.acts_as_taggable_on_engine.rb b/db/migrate/20160712054812_add_missing_taggable_index.acts_as_taggable_on_engine.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # This migration comes from acts_as_taggable_on_engine (originally 4)
-class AddMissingTaggableIndex < ActiveRecord::Migration
+class AddMissingTaggableIndex < ActiveRecord::Migration[5.1]
   def self.up
     add_index :taggings, %i[taggable_id taggable_type context]
   end

diff --git a/db/migrate/20160712054813_change_collation_for_tag_names.acts_as_taggable_on_engine.rb b/db/migrate/20160712054813_change_collation_for_tag_names.acts_as_taggable_on_engine.rb
@@ -3,7 +3,7 @@
 # This migration comes from acts_as_taggable_on_engine (originally 5)
 # This migration is added to circumvent issue #623 and have special characters
 # work properly
-class ChangeCollationForTagNames < ActiveRecord::Migration
+class ChangeCollationForTagNames < ActiveRecord::Migration[5.1]
   def up
     if ActsAsTaggableOn::Utils.using_mysql?
       execute('ALTER TABLE tags MODIFY name varchar(255) CHARACTER SET utf8 COLLATE utf8_bin;')

diff --git a/db/migrate/20160712055201_create_favorites.rb b/db/migrate/20160712055201_create_favorites.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateFavorites < ActiveRecord::Migration
+class CreateFavorites < ActiveRecord::Migration[5.1]
   def change
     create_table :favorites do |t|
       t.references :user, index: true, foreign_key: true

diff --git a/db/migrate/20160712061113_create_comments.rb b/db/migrate/20160712061113_create_comments.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateComments < ActiveRecord::Migration
+class CreateComments < ActiveRecord::Migration[5.1]
   def change
     create_table :comments do |t|
       t.text :body

diff --git a/db/migrate/20160712061614_acts_as_follower_migration.rb b/db/migrate/20160712061614_acts_as_follower_migration.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class ActsAsFollowerMigration < ActiveRecord::Migration
+class ActsAsFollowerMigration < ActiveRecord::Migration[5.1]
   def self.up
     create_table :follows, force: true do |t|
       t.references :followable, polymorphic: true, null: false

diff --git a/db/schema.rb b/db/schema.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -14,93 +13,90 @@
 ActiveRecord::Schema.define(version: 20160712061614) do
 
   create_table "articles", force: :cascade do |t|
-    t.string   "title"
-    t.string   "slug"
-    t.text     "body"
-    t.string   "description"
-    t.integer  "favorites_count"
-    t.integer  "user_id"
-    t.datetime "created_at",      null: false
-    t.datetime "updated_at",      null: false
+    t.string "title"
+    t.string "slug"
+    t.text "body"
+    t.string "description"
+    t.integer "favorites_count"
+    t.integer "user_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["slug"], name: "index_articles_on_slug", unique: true
+    t.index ["user_id"], name: "index_articles_on_user_id"
   end
 
-  add_index "articles", ["slug"], name: "index_articles_on_slug", unique: true
-  add_index "articles", ["user_id"], name: "index_articles_on_user_id"
-
   create_table "comments", force: :cascade do |t|
-    t.text     "body"
-    t.integer  "user_id"
-    t.integer  "article_id"
+    t.text "body"
+    t.integer "user_id"
+    t.integer "article_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.index ["article_id"], name: "index_comments_on_article_id"
+    t.index ["user_id"], name: "index_comments_on_user_id"
   end
 
-  add_index "comments", ["article_id"], name: "index_comments_on_article_id"
-  add_index "comments", ["user_id"], name: "index_comments_on_user_id"
-
   create_table "favorites", force: :cascade do |t|
-    t.integer  "user_id"
-    t.integer  "article_id"
+    t.integer "user_id"
+    t.integer "article_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.index ["article_id"], name: "index_favorites_on_article_id"
+    t.index ["user_id"], name: "index_favorites_on_user_id"
   end
 
-  add_index "favorites", ["article_id"], name: "index_favorites_on_article_id"
-  add_index "favorites", ["user_id"], name: "index_favorites_on_user_id"
-
   create_table "follows", force: :cascade do |t|
-    t.integer  "followable_id",                   null: false
-    t.string   "followable_type",                 null: false
-    t.integer  "follower_id",                     null: false
-    t.string   "follower_type",                   null: false
-    t.boolean  "blocked",         default: false, null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string "followable_type"
+    t.integer "followable_id", null: false
+    t.string "follower_type"
+    t.integer "follower_id", null: false
+    t.boolean "blocked", default: false, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["followable_id", "followable_type"], name: "fk_followables"
+    t.index ["followable_type", "followable_id"], name: "index_follows_on_followable_type_and_followable_id"
+    t.index ["follower_id", "follower_type"], name: "fk_follows"
+    t.index ["follower_type", "follower_id"], name: "index_follows_on_follower_type_and_follower_id"
   end
 
-  add_index "follows", ["followable_id", "followable_type"], name: "fk_followables"
-  add_index "follows", ["follower_id", "follower_type"], name: "fk_follows"
-
   create_table "taggings", force: :cascade do |t|
-    t.integer  "tag_id"
-    t.integer  "taggable_id"
-    t.string   "taggable_type"
-    t.integer  "tagger_id"
-    t.string   "tagger_type"
-    t.string   "context",       limit: 128
+    t.integer "tag_id"
+    t.string "taggable_type"
+    t.integer "taggable_id"
+    t.string "tagger_type"
+    t.integer "tagger_id"
+    t.string "context", limit: 128
     t.datetime "created_at"
+    t.index ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true
+    t.index ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context"
+    t.index ["taggable_type", "taggable_id"], name: "index_taggings_on_taggable_type_and_taggable_id"
+    t.index ["tagger_type", "tagger_id"], name: "index_taggings_on_tagger_type_and_tagger_id"
   end
 
-  add_index "taggings", ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true
-  add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context"
-
   create_table "tags", force: :cascade do |t|
-    t.string  "name"
+    t.string "name"
     t.integer "taggings_count", default: 0
+    t.index ["name"], name: "index_tags_on_name", unique: true
   end
 
-  add_index "tags", ["name"], name: "index_tags_on_name", unique: true
-
   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"
+    t.string "email", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0,  null: false
+    t.integer "sign_in_count", default: 0, null: false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.datetime "created_at",                          null: false
-    t.datetime "updated_at",                          null: false
-    t.string   "username"
-    t.string   "image"
-    t.text     "bio"
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "username"
+    t.string "image"
+    t.text "bio"
+    t.index ["email"], name: "index_users_on_email", unique: true
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+    t.index ["username"], name: "index_users_on_username", unique: true
   end
 
-  add_index "users", ["email"], name: "index_users_on_email", unique: true
-  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
-
 end
diff --git a/db/seeds.rb b/db/seeds.rb
diff --git a/lib/assets/.keep b/lib/assets/.keep
diff --git a/lib/tasks/.keep b/lib/tasks/.keep
diff --git a/log/.keep b/log/.keep
diff --git a/project-logo.png b/project-logo.png
diff --git a/public/404.html b/public/404.html
diff --git a/public/422.html b/public/422.html
diff --git a/public/500.html b/public/500.html
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/robots.txt b/public/robots.txt
diff --git a/test/controllers/.keep b/test/controllers/.keep
diff --git a/test/controllers/articles_controller_test.rb b/test/controllers/articles_controller_test.rb
diff --git a/test/fixtures/.keep b/test/fixtures/.keep
diff --git a/test/fixtures/articles.yml b/test/fixtures/articles.yml
diff --git a/test/fixtures/comments.yml b/test/fixtures/comments.yml
diff --git a/test/fixtures/favorites.yml b/test/fixtures/favorites.yml
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
diff --git a/test/helpers/.keep b/test/helpers/.keep
diff --git a/test/integration/.keep b/test/integration/.keep
diff --git a/test/mailers/.keep b/test/mailers/.keep
diff --git a/test/models/.keep b/test/models/.keep
diff --git a/test/models/article_test.rb b/test/models/article_test.rb
diff --git a/test/models/comment_test.rb b/test/models/comment_test.rb
diff --git a/test/models/favorite_test.rb b/test/models/favorite_test.rb
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
diff --git a/test/test_helper.rb b/test/test_helper.rb
diff --git a/vendor/assets/javascripts/.keep b/vendor/assets/javascripts/.keep
diff --git a/vendor/assets/stylesheets/.keep b/vendor/assets/stylesheets/.keep