Merge branch 'master' into log-bounced-emails

This commit is contained in:
Karl Erik Õunapuu 2020-12-04 13:46:48 +02:00 committed by GitHub
commit 4adc240b0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
141 changed files with 3748 additions and 1214 deletions

View file

@ -0,0 +1,21 @@
class MakeWhoisDisclamerI18ned < ActiveRecord::Migration[6.0]
def up
entry = SettingEntry.find_by(code: 'registry_whois_disclaimer')
hash = { en: 'Search results may not be used for commercial, advertising, recompilation, repackaging, redistribution, reuse, obscuring or other similar activities.',
et: 'Otsitulemusi ei tohi kasutada ärilistel, reklaami, ümber töötlemise, edasi levitamise, taaskasutuse, muutmise ega muul sarnasel eesmärgil.',
ru: 'Результаты поиска не могут быть использованы в коммерческих целях, включая, но не ограничиваясь, рекламу, рекомпиляцию, изменение формата, перераспределение либо переиспользование.' }
string = JSON.generate(hash)
entry.format = 'hash'
entry.value = string
entry.save!
end
def down
entry = SettingEntry.find_by(code: 'registry_whois_disclaimer')
string = 'Search results may not be used for commercial, advertising, recompilation, \
repackaging, redistribution, reuse, obscuring or other similar activities.'
entry.format = 'string'
entry.value = string
entry.save!
end
end

View file

@ -1,2 +1,2 @@
# encoding: UTF-8
DataMigrate::Data.define(version: 20200901131427)
DataMigrate::Data.define(version: 20201007104651)