bring back the city.

2 files changed, 14 insertions, 12 deletions

diff --git a/db/migrate/20141001025113_remove_location_info_from_user_sessions.rb b/db/migrate/20141001025113_remove_location_info_from_user_sessions.rb
index ed25f4c2..f42f4764 100644
--- a/db/migrate/20141001025113_remove_location_info_from_user_sessions.rb
+++ b/db/migrate/20141001025113_remove_location_info_from_user_sessions.rb
@@ -11,7 +11,6 @@ class RemoveLocationInfoFromUserSessions < ActiveRecord::Migration
     remove_column :users, :last_sign_in_at
     remove_column :users, :current_sign_in_ip
     remove_column :users, :last_sign_in_ip
-    remove_column :users, :city
     remove_column :users, :latitude
     remove_column :users, :longitude
     remove_column :users, :confirmation_token
diff --git a/db/schema.rb b/db/schema.rb
index 482f294d..d3c5a036 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -31,8 +31,8 @@ ActiveRecord::Schema.define(version: 20141001025113) do
 
   create_table "avatars", force: true do |t|
     t.integer  "user_id"
-    t.datetime "created_at",        null: false
-    t.datetime "updated_at",        null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "avatar"
     t.boolean  "avatar_processing"
     t.string   "avatar_tmp"
@@ -85,8 +85,8 @@ ActiveRecord::Schema.define(version: 20141001025113) do
     t.datetime "failed_at"
     t.string   "locked_by"
     t.string   "queue"
-    t.datetime "created_at",             null: false
-    t.datetime "updated_at",             null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree
@@ -103,8 +103,8 @@ ActiveRecord::Schema.define(version: 20141001025113) do
 
   create_table "interests", force: true do |t|
     t.string   "name"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   create_table "locations", id: :uuid, default: "uuid_generate_v4()", force: true do |t|
@@ -157,13 +157,15 @@ ActiveRecord::Schema.define(version: 20141001025113) do
     t.integer "taggings_count", default: 0
   end
 
+  add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree
+
   create_table "tutorials", force: true do |t|
     t.string   "heading"
     t.text     "description"
     t.string   "url"
     t.integer  "user_id"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "image_url"
     t.string   "author"
     t.string   "author_url"
@@ -188,8 +190,8 @@ ActiveRecord::Schema.define(version: 20141001025113) do
   add_index "user_sessions", ["user_id"], name: "index_user_sessions_on_user_id", using: :btree
 
   create_table "users", force: true do |t|
-    t.string   "email",                              default: "", null: false
-    t.string   "encrypted_password",     limit: 128, default: "", null: false
+    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 "created_at"
@@ -198,10 +200,11 @@ ActiveRecord::Schema.define(version: 20141001025113) do
     t.string   "website"
     t.string   "twitter"
     t.string   "facebook"
+    t.string   "city"
     t.string   "password_salt"
     t.string   "authentication_token"
     t.string   "full_address"
-    t.integer  "creations_count",                    default: 0
+    t.integer  "creations_count",        default: 0
     t.boolean  "admin"
   end