Artur Beljajev 1d79f6548d 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		2018-08-09 15:01:23 +03:00
..
admin	Merge branch 'registry-791' into registry-790	2018-07-27 16:18:28 +03:00
application	Revert to old flash behavior	2018-06-26 15:52:46 +03:00
epp	Fix Rubocop issues after Ruby upgrade	2018-04-27 15:23:49 +03:00
for_models	Remove information about web-based whois form name fields	2018-04-27 14:26:49 +03:00
kaminari/admin	108869472-pagination_modification	2016-04-29 14:18:44 +03:00
layouts	Revert to old flash behavior	2018-06-26 15:52:46 +03:00
mailers	Improve readability	2018-03-06 13:11:22 +02:00
registrant	Remove unused view	2018-08-01 22:13:55 +03:00
registrar	Unify contact.auth_info look and feel	2018-06-18 13:30:57 +03:00
shared	Story#105855968 - admin/show mark if registrar is test	2016-03-21 12:18:48 +02:00