15 commits

Author	SHA1	Message	Date
Martin	d0ab1711ff	fix(profil_controller#update_email): ensure we are not merging same account ... fix(profil_controller#update_email): changing email from current_user.email to current_user.email destroy current user. whoops ☠️' Update config/locales/en.yml Co-authored-by: Pierre de La Morinerie <pierre.de_la_morinerie@beta.gouv.fr> Update config/locales/fr.yml Co-authored-by: Pierre de La Morinerie <pierre.de_la_morinerie@beta.gouv.fr> Update spec/controllers/users/profil_controller_spec.rb Update config/locales/fr.yml Co-authored-by: Pierre de La Morinerie <pierre.de_la_morinerie@beta.gouv.fr> Update spec/controllers/users/profil_controller_spec.rb fix(spec): broken due to typo	2021-12-29 13:36:47 +01:00
Paul Chavard	716a859c93	fix(profile): prevent crashing on renew token action	2021-11-16 20:01:56 +03:00
simon lehericey	17d131b3cc	add has_may requested_merge_from	2021-11-04 16:10:09 +01:00
simon lehericey	9041e201e8	one merge at a time	2021-11-04 16:10:09 +01:00
simon lehericey	b160086cc5	update update_email to allow merge	2021-11-04 16:10:09 +01:00
simon lehericey	652b8367be	accept or refuse merge	2021-11-04 16:10:09 +01:00
simon lehericey	894e8fdd47	move update_email check to before_action	2021-11-04 16:10:09 +01:00
simon lehericey	44c880adc4	allow instructeur and administrateur to change their email to legit domain (#6550)	2021-10-19 15:54:57 +02:00
simon lehericey	7239657a75	[Fix #6481] a user see its waiting transfers	2021-09-20 13:58:11 +02:00
simon lehericey	c34476a766	a user can transfer all its dossier	2021-09-20 13:58:11 +02:00
simon lehericey	058442c84e	[link to #4557] An instructeur cannot change its email on its own	2019-12-11 17:18:21 +01:00
simon lehericey	21910c959e	@current_user -> current_user	2019-12-11 17:18:21 +01:00
Pierre de La Morinerie	03fc555edf	profile: send an email when the account is already taken	2019-07-10 11:31:09 +02:00
simon lehericey	d36f6ebcd7	[fix #1709] A user can change its email	2019-07-09 11:55:17 +02:00
simon lehericey	d68d2be798	Profil: accessible to all roles	2019-07-09 11:55:17 +02:00

Renamed from app/controllers/new_administrateur/profil_controller.rb (Browse further)