Merge branch 'master' of github.com:domify/registry

Conflicts:
	CHANGELOG.md
	app/mailers/domain_mailer.rb
	app/models/domain.rb
	app/views/layouts/registrant/application.haml
	config/application-example.yml
	config/locales/en.yml
	config/routes.rb
	spec/mailers/domain_mailer_spec.rb

app/models/ability.rb

@@ -13,6 +13,7 @@ class Ability
     when 'ApiUser'
       epp
       registrar
+      registrant # refactor 
     end
 
     can :show, :dashboard
@@ -63,6 +64,10 @@ class Ability
     can :manage, :deposit
   end
 
+  def registrant
+    can :manage, Registrant::Whois
+  end
+
   def user
     can :show, :dashboard
   end

app/models/domain.rb

@@ -60,9 +60,10 @@ class Domain < ActiveRecord::Base
   def manage_statuses
     return unless registrant_id_changed?
     if registrant_verification_asked_at.present?
-      domain_statuses.build(value: DomainStatus::PENDING_UPDATE) 
+      domain_statuses.build(value: DomainStatus::PENDING_UPDATE)
       DomainMailer.registrant_updated(self).deliver_now
     end
+    true
   end
 
   before_save :touch_always_version
@@ -140,8 +141,8 @@ class Domain < ActiveRecord::Base
     def included
       includes(
         :registrant,
-        :registrar, 
-        :nameservers, 
+        :registrar,
+        :nameservers,
         :whois_record,
         { tech_contacts: :registrar },
         { admin_contacts: :registrar }
@@ -253,7 +254,7 @@ class Domain < ActiveRecord::Base
     end
 
     # otherwise domain_statuses are in old state for domain object
-    domain_statuses.reload 
+    domain_statuses.reload
   end
 
   def children_log