Merge branch 'master' into registry-790

# Conflicts:
#	test/integration/epp/domain/domain_delete_test.rb
#	test/integration/epp/domain/domain_update_test.rb
#	test/integration/epp/domain/transfer/request_test.rb
#	test/system/admin_area/domains_test.rb
This commit is contained in:
Artur Beljajev 2018-08-09 15:01:23 +03:00
commit 1d79f6548d
61 changed files with 731 additions and 84 deletions

View file

@ -1,21 +0,0 @@
- content_for :actions do
= render 'shared/title', name: t(:registrars)
.row
.col-md-12
.table-responsive
%table.table.table-hover.table-bordered.table-condensed
%thead
%tr
%th{class: 'col-xs-6'}
= sort_link(@q, 'name')
%th{class: 'col-xs-6'}
= sort_link(@q, 'reg_no', Registrar.human_attribute_name(:reg_no))
%tbody
- @registrars.each do |x|
%tr
%td= link_to(x, [:registrar, x])
%td= x.reg_no
.row
.col-md-12
= paginate @registrars