Dmitriy Zaporozhets 4291e28af7 Merge branch 'change-primary-email' into 'master' ... Allow primary email to be set to an email that you've already added. Fixes gitlab-com/support-forum#106. When the user sets their primary email to an email that they've already added to their account, this patch makes sure that secondary email record is destroyed, and a new email record is created for the old primary email. This is based on the assumption that in this case no email was meant to be deleted, but the user simply wanted to change which of their emails is primary. See merge request !591		2015-05-03 11:00:51 +00:00
..
application_controller.rb	Add helpers for header title and sidebar, and move setting those from controllers to layouts.	2015-05-01 10:39:16 +02:00
application_settings_controller.rb	Add application setting to restrict user signups to e-mail domains	2015-05-02 09:36:52 -07:00
applications_controller.rb	Small improvements to CI	2015-01-17 16:17:34 -08:00
background_jobs_controller.rb	Use Gitlab.config instead of Settings everywhere	2014-10-15 23:01:31 +02:00
broadcast_messages_controller.rb	Fixed the Rails/ActionFilter cop	2015-04-20 15:39:37 +02:00
dashboard_controller.rb	Explicitly define ordering in models using default_scope	2015-02-05 14:20:55 -08:00
deploy_keys_controller.rb	Fixed the Rails/ActionFilter cop	2015-04-20 15:39:37 +02:00
groups_controller.rb	Fixed the Rails/ActionFilter cop	2015-04-20 15:39:37 +02:00
hooks_controller.rb	Revert "Added X-GitLab-Event header for web hooks"	2015-04-27 16:29:31 +03:00
keys_controller.rb	Fixed the Rails/ActionFilter cop	2015-04-20 15:39:37 +02:00
logs_controller.rb	Added the correct hierarchy of controllers for the administrative part	2013-01-24 22:31:24 +02:00
projects_controller.rb	Fixed the Rails/ActionFilter cop	2015-04-20 15:39:37 +02:00
services_controller.rb	Fix bug where Slack service channel was not saved in admin template settings.	2015-04-24 08:33:24 -07:00
users_controller.rb	Allow primary email to be set to an email that you've already added.	2015-04-30 16:17:03 +02:00