zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-16 17:37:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

MERGE: merged staging at 3235647, resolved merge conflict

Browse source
This commit is contained in:
Matt Farnsworth 2015-10-30 16:12:20 +02:00
commit 45588dc72a
78 changed files with 308808 additions and 421 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spec/models/domain_spec.rb
View file

@ -245,7 +245,7 @@ describe Domain do
@domain.set_force_delete
@domain.statuses.should match_array([
"forceDelete",
"serverForceDelete",
"pendingDelete",
"serverManualInzone",
"serverRenewProhibited",
@ -286,7 +286,7 @@ describe Domain do
"clientHold",
"deleteCandidate",
"expired",
"forceDelete",
"serverForceDelete",
"pendingDelete",
"serverHold",
"serverRenewProhibited",