Merge branch '109367694-epp-id-conventions' into staging

This commit is contained in:
Matt Farnsworth 2015-12-04 17:58:21 +02:00
commit 3e8870022a

View file

@ -38,7 +38,7 @@ module Versions
user = AdminUser.find_by(id: $1) if str =~ /^(\d+)-AdminUser:/ user = AdminUser.find_by(id: $1) if str =~ /^(\d+)-AdminUser:/
unless user.present? unless user.present?
# on import we copied Registrar name, which may eql code # on import we copied Registrar name, which may eql code
registrar = Registrar.find_by(name: str).first registrar = Registrar.find_by(name: str)
# assume each registrar has only one user # assume each registrar has only one user
user = registrar.api_users.first if registrar user = registrar.api_users.first if registrar
end end