From: Tom Hughes Date: Wed, 20 Nov 2019 18:56:42 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/2439' X-Git-Tag: live~3463 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f1905095ed55b2f89021849d4355d7c23d0b8c6b?hp=6852bc9c9255aca49da991d295c2b8c5555a3db9 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 index 000000000..7d9383dc6 --- /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 6370eb95a..78e58d4be 100644 --- 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'),