Merge branch 'master' into add-contacts-email-constraint

# Conflicts:
#	db/structure.sql
This commit is contained in:
Artur Beljajev 2018-08-27 12:21:51 +03:00
commit 23c0d4f6ab
115 changed files with 1049 additions and 756 deletions

View file

@ -0,0 +1,5 @@
class RenameDomainsStatusesBackupToStatusesBeforeForceDelete < ActiveRecord::Migration
def change
rename_column :domains, :statuses_backup, :statuses_before_force_delete
end
end

View file

@ -0,0 +1,5 @@
class RenameUsersPasswordToPlainTextPassword < ActiveRecord::Migration
def change
rename_column :users, :password, :plain_text_password
end
end

View file

@ -909,7 +909,7 @@ CREATE TABLE public.domains (
statuses character varying[],
reserved boolean DEFAULT false,
status_notes public.hstore,
statuses_backup character varying[] DEFAULT '{}'::character varying[],
statuses_before_force_delete character varying[] DEFAULT '{}'::character varying[],
upid integer,
up_date timestamp without time zone,
uuid uuid DEFAULT public.gen_random_uuid() NOT NULL
@ -2282,7 +2282,7 @@ ALTER SEQUENCE public.settings_id_seq OWNED BY public.settings.id;
CREATE TABLE public.users (
id integer NOT NULL,
username character varying,
password character varying,
plain_text_password character varying,
created_at timestamp without time zone,
updated_at timestamp without time zone,
email character varying,
@ -4747,6 +4747,8 @@ INSERT INTO schema_migrations (version) VALUES ('20180327151906');
INSERT INTO schema_migrations (version) VALUES ('20180331200125');
INSERT INTO schema_migrations (version) VALUES ('20180422154642');
INSERT INTO schema_migrations (version) VALUES ('20180612042234');
INSERT INTO schema_migrations (version) VALUES ('20180612042625');
@ -4757,5 +4759,7 @@ INSERT INTO schema_migrations (version) VALUES ('20180613030330');
INSERT INTO schema_migrations (version) VALUES ('20180613045614');
INSERT INTO schema_migrations (version) VALUES ('20180713154915');
INSERT INTO schema_migrations (version) VALUES ('20180816123540');