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