mirror of
https://github.com/internetee/registry.git
synced 2025-07-03 01:33:36 +02:00
MERGE: merged staging at 3235647
, resolved merge conflict
This commit is contained in:
commit
45588dc72a
78 changed files with 308808 additions and 421 deletions
|
@ -3,13 +3,15 @@ class Admin::ReservedDomainsController < AdminController
|
|||
|
||||
def index
|
||||
rd = ReservedDomain.first_or_initialize
|
||||
@reserved_domains = rd.names.to_yaml
|
||||
rd.names = nil if rd.names.blank?
|
||||
@reserved_domains = rd.names.to_yaml.gsub(/---.?\n/, '').gsub(/\.\.\..?\n/, '')
|
||||
end
|
||||
|
||||
def create
|
||||
@reserved_domains = params[:reserved_domains]
|
||||
|
||||
begin
|
||||
params[:reserved_domains] = "---\n" if params[:reserved_domains].blank?
|
||||
names = YAML.load(params[:reserved_domains])
|
||||
fail if names == false
|
||||
rescue
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue