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

Merge branch 'staging' of http://github.com/internetee/registry into staging

Browse source
This commit is contained in:
Matt Farnsworth 2015-11-26 18:57:35 +02:00
commit 14a2a6cc02
6 changed files with 109 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/api/repp/domain_v1.rb
View file

@ -35,7 +35,7 @@ module Repp
error! I18n.t('errors.messages.epp_authorization_error'), 401 unless domain.auth_info.eql? request.headers['Auth-Code']
contact_repp_json = proc{|contact|
contact.attributes.slice("code", "ident_type", "ident_country_code", "phone", "email", "street", "city", "zip","country_code", "statuses")
contact.attributes.slice("code", "name", "ident", "ident_type", "ident_country_code", "phone", "email", "street", "city", "zip","country_code", "statuses")
}
@response = {

2
app/mailers/contact_mailer.rb
View file

@ -4,7 +4,7 @@ class ContactMailer < ApplicationMailer
def email_updated(email, contact_id, should_deliver)
@contact = Contact.find_by(id: contact_id)
return unless email || @contact
return if delivery_off?(contact, should_deliver)
return if delivery_off?(@contact, should_deliver)
return if whitelist_blocked?(email)
begin