Merge remote-tracking branch 'origin/master' into 5024-prevent-duplicate-referentials-from-being-created-during-parallel-db-transactions--rb201711271659

Conflicts:
	app/models/referential.rb

A whitespace conflict in a place I don't even remember editing? Okaay.

1 files changed, 2 insertions, 1 deletions

diff --git a/app/controllers/referential_companies_controller.rb b/app/controllers/referential_companies_controller.rb
index fdbd83dc9..ca1ff67db 100644
--- a/app/controllers/referential_companies_controller.rb
+++ b/app/controllers/referential_companies_controller.rb
@@ -1,4 +1,5 @@
 class ReferentialCompaniesController < ChouetteController
+  include ReferentialSupport
   defaults :resource_class => Chouette::Company, :collection_name => 'companies', :instance_name => 'company'
   respond_to :html
   respond_to :xml
@@ -55,7 +56,7 @@ class ReferentialCompaniesController < ChouetteController
   end
 
   def company_params
-    params.require(:company).permit( :objectid, :object_version, :creator_id, :name, :short_name, :organizational_unit, :operating_department_name, :code, :phone, :fax, :email, :registration_number, :url, :time_zone )
+    params.require(:company).permit( :objectid, :object_version, :name, :short_name, :organizational_unit, :operating_department_name, :code, :phone, :fax, :email, :registration_number, :url, :time_zone )
   end
 
   private