Merge branch 'story/105855968-directo' into staging

# Conflicts:
#	Gemfile
#	Gemfile.lock
This commit is contained in:
Vladimir Krylov 2016-03-11 11:26:14 +02:00
commit 7d8cc9839f
15 changed files with 444 additions and 229 deletions

View file

@ -57,7 +57,7 @@ class Admin::RegistrarsController < AdminController
def registrar_params
params.require(:registrar).permit(
:name, :reg_no, :vat_no, :street, :city, :state, :zip, :billing_address,
:country_code, :email, :phone, :billing_email, :code
:country_code, :email, :phone, :billing_email, :code, :exclude_in_monthly_directo
)
end
end