Merge branch 'master' into status-refactor

Conflicts:
	app/models/domain.rb
	db/schema.rb
This commit is contained in:
Martin Lensment 2015-06-16 16:20:59 +03:00
commit 4bf5a968bd
29 changed files with 4911 additions and 49 deletions

View file

@ -7,7 +7,8 @@
%dd= @contact.code
%dt= t(:password)
%dd= @contact.auth_info
%dd
= text_field_tag :auth_info, @contact.auth_info, readonly: true, class: 'partially-hidden'
%br

View file

@ -13,7 +13,8 @@
%dd= link_to(@domain.registrar, root_path)
%dt= t(:password)
%dd= @domain.auth_info
%dd
= text_field_tag :password, @domain.auth_info, readonly: true, class: 'partially-hidden'
%dt= t(:valid_from)
%dd= l(@domain.valid_from)