Merge branch 'master' into registry-791

This commit is contained in:
Artur Beljajev 2018-04-20 17:37:43 +03:00
commit 696a3871b7
114 changed files with 905 additions and 440 deletions

View file

@ -22,9 +22,6 @@
class: 'form-control input-sm' %>
</dd>
<dt><%= t(:valid_from) %></dt>
<dd><%= l(@domain.valid_from) %></dd>
<dt><%= t(:valid_to) %></dt>
<dd><%= l(@domain.valid_to) %></dd>

View file

@ -66,12 +66,10 @@
%p
= link_to t(:pending_epp), '#', class: 'js-pending'
%td{class: changing_css_class(version, "period", "period_unit", "valid_from", "valid_to")}
%td{class: changing_css_class(version, "period", "period_unit", "valid_to")}
%p
= "#{domain.period}#{domain.period_unit}"
%br
= "#{l(domain.valid_from, format: :date)}"
%br
= "#{l(domain.valid_to, format: :date)}"
%td