diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-21 00:54:03 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-21 00:54:03 +0000 |
| commit | f0d052b6e73066ad451685f5a3dfdb1032cf95ea (patch) | |
| tree | fc4da12d719c7e41a98a66c10a8a05163d726e50 /app/controllers/profiles_controller.rb | |
| parent | 52c3a3a0d29c37275e22da71dbabead7b3dd0609 (diff) | |
| parent | d85f396fe55e0c8d6593bbd2dcb06990da48d9b7 (diff) | |
| download | gitlab-ce-f0d052b6e73066ad451685f5a3dfdb1032cf95ea.tar.gz | |
Merge branch 'user-location' into 'master'
Location field in user profile
Twitter allows you to set string with location information.
I find it very useful in work to know where user from. It allows to communicate with knowing time difference and cultural things.
See merge request !411
Diffstat (limited to 'app/controllers/profiles_controller.rb')
| -rw-r--r-- | app/controllers/profiles_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb index 3c7f45d559b..9252e85e8cc 100644 --- a/app/controllers/profiles_controller.rb +++ b/app/controllers/profiles_controller.rb @@ -69,7 +69,7 @@ class ProfilesController < ApplicationController 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 + :avatar, :hide_no_ssh_key, :hide_no_password, :location ) end end |