Xavier J 647eaa4ba8 Merge branch 'develop' into develop_v2 ... # Conflicts: # Gemfile.lock # db/schema.rb		2016-11-17 16:55:41 +01:00
..
admin	Fix major DEPRECATION WARNING for spec/controllers/admin/*.rb	2016-11-15 05:19:30 +01:00
administrateur	sign_out all devises connect before sign_in an other	2015-12-09 15:10:11 +01:00
api	Merge branch 'develop' into develop_v2	2016-11-17 16:55:41 +01:00
backoffice	Fix major DEPRECATION WARNING for spec/controllers/backoffice/*.rb	2016-11-15 04:50:18 +01:00
ban	Fix DEPRECATION WARNING for spec/controllers/ban/*.rb	2016-11-15 04:26:25 +01:00
france_connect	Fix tests spec/controllers/france_connect/*.rb	2016-11-15 04:42:32 +01:00
gestionnaires	Fix DEPRECATION WARNING for spec/controllers/gestionnaires/*.rb	2016-11-15 04:29:05 +01:00
sessions	sign_out all devises connect before sign_in an other	2015-12-09 15:10:11 +01:00
users	Fix major .DEPRECATION WARNING for spec/controllers/users/*.rb	2016-11-15 05:54:27 +01:00
api_controller_spec.rb	Fix DEPRECATION WARNING for spec/controllers/*.rb	2016-11-15 04:24:09 +01:00
backoffice_controller_spec.rb	- Delete routes 'users/dossiers/a_traiter - en_attente - termine' for user	2015-12-02 18:03:52 +01:00
invites_controller_spec.rb	Fix DEPRECATION WARNING for spec/controllers/*.rb	2016-11-15 04:24:09 +01:00
root_controller_spec.rb	Hide gestionnaire login link (unified login)	2016-10-18 15:52:14 +02:00
users_controller_shared_example.rb	Fix DEPRECATION WARNING for spec/controllers/*.rb	2016-11-15 04:24:09 +01:00
users_controller_spec.rb	Fix DEPRECATION WARNING for spec/controllers/*.rb	2016-11-15 04:24:09 +01:00