Artur Beljajev 837f326ef6 Merge branch 'master' into registry-623 ... # Conflicts: # app/controllers/admin/registrars_controller.rb # app/models/registrar.rb # app/views/admin/registrars/_billing.html.erb # app/views/admin/registrars/show.html.erb # config/locales/admin/registrars.en.yml # config/locales/en.yml # db/migrate/20180309053424_add_registrars_unique_constraints.rb # db/structure.sql # test/fixtures/registrars.yml # test/integration/admin/registrars/delete_test.rb # test/integration/admin/registrars/new_test.rb # test/models/registrar_test.rb		2018-03-29 12:13:59 +03:00
..
admin	Merge branch 'master' into registry-623	2018-03-29 12:13:59 +03:00
application	Merge branch 'master' into registry-475	2017-04-26 13:46:14 +03:00
epp	Remove unused view	2018-02-13 23:50:22 +02:00
for_models	Rename registrar's url attribute to website	2017-02-21 16:15:26 +02:00
kaminari/admin	108869472-pagination_modification	2016-04-29 14:18:44 +03:00
layouts	Load JS in async mode	2018-01-26 11:00:46 +02:00
mailers	Improve readability	2018-03-06 13:11:22 +02:00
registrant	Refactor registrars	2018-03-26 07:00:54 +03:00
registrar	Merge branch 'master' into registry-623	2018-03-29 12:13:59 +03:00
shared	Story#105855968 - admin/show mark if registrar is test	2016-03-21 12:18:48 +02:00