diff options
| author | Senorsen <sen@senorsen.com> | 2015-04-14 00:28:49 +0800 |
|---|---|---|
| committer | Senorsen <sen@senorsen.com> | 2015-04-14 19:42:48 +0800 |
| commit | 7b28218f96d14c9650484a183ffab3b2132b05db (patch) | |
| tree | a79cbd394f52a00ba69b1d9b9f192d7ce0b35082 /app/controllers/profiles_controller.rb | |
| parent | ae6d0aaae0d8f6251b30a8e5243a98f083f0cac9 (diff) | |
| download | gitlab-ce-7b28218f96d14c9650484a183ffab3b2132b05db.tar.gz | |
Allow user to choose which email to be public
This commit allows user to show one of their emails in profile page,
or don't show email in this page.
Diffstat (limited to 'app/controllers/profiles_controller.rb')
| -rw-r--r-- | app/controllers/profiles_controller.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb index 9252e85e8cc..7f76906066d 100644 --- a/app/controllers/profiles_controller.rb +++ b/app/controllers/profiles_controller.rb @@ -67,9 +67,10 @@ class ProfilesController < ApplicationController def user_params params.require(:user).permit( - :email, :password, :password_confirmation, :bio, :name, :username, - :skype, :linkedin, :twitter, :website_url, :color_scheme_id, :theme_id, - :avatar, :hide_no_ssh_key, :hide_no_password, :location + :email, :password, :password_confirmation, :bio, :name, + :username, :skype, :linkedin, :twitter, :website_url, + :color_scheme_id, :theme_id, :avatar, :hide_no_ssh_key, + :hide_no_password, :location, :public_email ) end end |