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
..
environments	Disable "bullet" gem in test env	2017-10-12 06:39:52 +03:00
initializers	Remove unused constant	2018-02-19 05:18:41 +02:00
locales	Merge branch 'master' into registry-623	2018-03-29 12:13:59 +03:00
application-example.yml	Improve application.yml sample	2018-01-11 13:42:35 +02:00
application.rb	Add Registry model	2018-02-28 09:53:53 +02:00
boot.rb	rails new	2014-06-10 11:43:04 +03:00
daemons.yml	Que log/pid moved to log/que #2724	2015-07-16 19:23:49 +03:00
database-example-development.yml	Remove unused "registrant_write_" keys from database config examples	2017-04-12 18:29:04 +03:00
database-example-registrant.yml	Remove unused "registrant_write_" keys from database config examples	2017-04-12 18:29:04 +03:00
database-example.yml	Added registrant database example	2015-05-18 12:51:10 +03:00
database-travis.yml	Remove unused "registrant_write_" keys from database config examples	2017-04-12 18:29:04 +03:00
deploy-example.rb	Story#120259603 - git uses right branch last commit message	2016-05-25 10:13:10 +03:00
environment.rb	rails new	2014-06-10 11:43:04 +03:00
puma.rb	Add puma config	2017-05-14 18:37:55 +03:00
routes.rb	Refactor registrars	2018-03-26 07:00:54 +03:00
schedule.rb	Add "Directo.send_monthly_invoices" to schedule	2017-05-08 01:09:29 +03:00
spring.rb	Move spring conf under conf dir #2711	2015-06-26 16:57:06 +03:00