Merge remote-tracking branch 'upstream/pull/2439'

diff --git a/db/migrate/20191120140058_remove_nearby_from_users.rb b/db/migrate/20191120140058_remove_nearby_from_users.rb
new file mode 100644 (file)
index 0000000..7d9383d
--- /dev/null
+++ b/db/migrate/20191120140058_remove_nearby_from_users.rb
@@ -0,0 +1,6 @@
+class RemoveNearbyFromUsers < ActiveRecord::Migration[5.2]
+  def change
+    # We've already ignored this column in the model, so it is safe to remove
+    safety_assured { remove_column :users, :nearby, :integer, :default => 50 }
+  end
+end

diff --git a/db/structure.sql b/db/structure.sql
index 6370eb95a0904a8b63b978b7d9abb1f5972822e6..78e58d4be5ba0b3394b42232cf3d62ebdb2d5ece 100644 (file)
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1394,7 +1394,6 @@ CREATE TABLE public.users (
     home_lat double precision,
     home_lon double precision,
     home_zoom smallint DEFAULT 3,
-    nearby integer DEFAULT 50,
     pass_salt character varying,
     email_valid boolean DEFAULT false NOT NULL,
     new_email character varying,
@@ -3137,6 +3136,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20190623093642'),
 ('20190702193519'),
 ('20190716173946'),
+('20191120140058'),
 ('21'),
 ('22'),
 ('23'),