zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-08 05:34:46 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into registry-623

Browse source 
# 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
This commit is contained in:
Artur Beljajev 2018-03-29 12:09:13 +03:00
commit 837f326ef6
37 changed files with 232 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

8
db/structure.sql
View file

@ -3244,7 +3244,7 @@ ALTER TABLE ONLY settings
--
-- Name: unique_code; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:
-- Name: unique_code; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:
--
ALTER TABLE ONLY registrars
@ -3260,7 +3260,7 @@ ALTER TABLE ONLY contacts
--
-- Name: unique_name; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:
-- Name: unique_name; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:
--
ALTER TABLE ONLY registrars
@ -3268,7 +3268,7 @@ ALTER TABLE ONLY registrars
--
-- Name: unique_reference_no; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:
-- Name: unique_reference_no; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:
--
ALTER TABLE ONLY registrars
@ -3276,7 +3276,7 @@ ALTER TABLE ONLY registrars
--
-- Name: unique_reg_no; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:
-- Name: unique_reg_no; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:
--
ALTER TABLE ONLY registrars