Merge branch 'master' into registry-661

# Conflicts:
#	db/structure.sql
This commit is contained in:
Artur Beljajev 2018-02-21 01:43:37 +02:00
commit 597dfbafdb
55 changed files with 536 additions and 277 deletions

View file

@ -1,9 +1,7 @@
api_bestnames:
session_id: 1
registrar: bestnames
data: <%= Base64.encode64(Marshal.dump({api_user_id: ActiveRecord::Fixtures.identify(:api_bestnames)})) %>
session_id: api_bestnames
user: api_bestnames
api_goodnames:
session_id: 2
registrar: goodnames
data: <%= Base64.encode64(Marshal.dump({api_user_id: ActiveRecord::Fixtures.identify(:api_goodnames)})) %>
session_id: api_goodnames
user: api_goodnames