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,5 +1,6 @@
FactoryBot.define do
factory :epp_session do
sequence(:session_id) { |n| "test#{n}" }
association :user, factory: :api_user
end
end