diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-29 13:51:31 -0500 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-29 13:51:31 -0500 |
| commit | 4aae86f6f71ab381de1d987a04d5e9c250cd2080 (patch) | |
| tree | 85766c97afe310da28cab5cf10c88a970cd9a54b /app/controllers | |
| parent | 673a45a14eaf532d96d15d635f526acea81f14b5 (diff) | |
| parent | 0033e57269518bdaab59c9b841d591176e33b5bc (diff) | |
| download | gitlab-ce-4aae86f6f71ab381de1d987a04d5e9c250cd2080.tar.gz | |
Merge remote-tracking branch 'dev/master'
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/profiles_controller.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb index ac71f72e624..9f5ad23a20f 100644 --- a/app/controllers/profiles_controller.rb +++ b/app/controllers/profiles_controller.rb @@ -93,8 +93,6 @@ class ProfilesController < Profiles::ApplicationController :linkedin, :location, :name, - :password, - :password_confirmation, :public_email, :skype, :twitter, |