Merge branch 'master' of github.com:domify/registry into registrar-portal

Conflicts:
	.travis.yml
This commit is contained in:
Martin Lensment 2015-03-23 17:12:15 +02:00
commit 57d239ccd1
9 changed files with 84 additions and 41 deletions

View file

@ -32,18 +32,15 @@
%dd
= l(@contact.created_at, format: :short)
by
= link_to(@contact.creator, [:admin, @contact.creator])
= creator_link(@contact)
%dt= t(:updated)
%dd
= l(@contact.updated_at, format: :short)
by
= link_to(@contact.updator, [:admin, @contact.updator])
= updator_link(@contact)
%dt= t(:registrar)
%dd
- if @contact.registrar.present?
= link_to(@contact.registrar, admin_registrar_path(@contact.registrar))