From 853e7b3a1c29d6faa63a69b8485027391ff2cc3b Mon Sep 17 00:00:00 2001 From: Matt Farnsworth Date: Fri, 30 Oct 2015 16:48:23 +0200 Subject: [PATCH] Merge: resolve merge conflict --- app/models/domain.rb | 2 +- app/models/domain_status.rb | 31 ------------------------------- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index 28dcda84e..5d70df9fb 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -379,7 +379,7 @@ class Domain < ActiveRecord::Base return false if statuses.include_any?(DomainStatus::DELETE_CANDIDATE, DomainStatus::SERVER_RENEW_PROHIBITED, DomainStatus::CLIENT_RENEW_PROHIBITED, DomainStatus::PENDING_RENEW, DomainStatus::PENDING_TRANSFER, DomainStatus::PENDING_DELETE, - DomainStatus::PENDING_UPDATE, 'pendingDeleteConfirmation') + DomainStatus::PENDING_UPDATE, DomainStatus::PENDING_DELETE_CONFIRMATION) true end diff --git a/app/models/domain_status.rb b/app/models/domain_status.rb index 1f1fabd8d..543ba0ff4 100644 --- a/app/models/domain_status.rb +++ b/app/models/domain_status.rb @@ -122,44 +122,13 @@ class DomainStatus < ActiveRecord::Base class << self def admin_statuses -<<<<<<< HEAD - [ - SERVER_HOLD, - # sync with admin_statuses_map - SERVER_MANUAL_INZONE, - SERVER_RENEW_PROHIBITED, - SERVER_TRANSFER_PROHIBITED, - SERVER_REGISTRANT_CHANGE_PROHIBITED, - SERVER_ADMIN_CHANGE_PROHIBITED, - SERVER_TECH_CHANGE_PROHIBITED, - SERVER_UPDATE_PROHIBITED, - SERVER_DELETE_PROHIBITED - ] -======= - # [ - # SERVER_HOLD, - # # sync with admin_statuses_map - # # SERVER_MANUAL_INZONE, - # # SERVER_RENEW_PROHIBITED, - # # SERVER_TRANSFER_PROHIBITED, - # # SERVER_REGISTRANT_CHANGE_PROHIBITED, - # # SERVER_ADMIN_CHANGE_PROHIBITED, - # # SERVER_TECH_CHANGE_PROHIBITED, - # SERVER_DELETE_PROHIBITED, - # SERVER_UPDATE_PROHIBITED - # ] admin_statuses_map.map(&:second) ->>>>>>> staging end def admin_statuses_map [ ['Hold', SERVER_HOLD], -<<<<<<< HEAD - # sync with admin_statuses -======= ->>>>>>> staging ['ManualInzone', SERVER_MANUAL_INZONE], # [''], ['RenewProhibited', SERVER_RENEW_PROHIBITED],