diff options
| author | Rubén Dávila <ruben@gitlab.com> | 2017-09-08 14:48:44 +0000 |
|---|---|---|
| committer | Rubén Dávila <ruben@gitlab.com> | 2017-09-08 14:48:44 +0000 |
| commit | 52a2423e373e6552023faaff43ae07dbb7423c00 (patch) | |
| tree | f6855f30c1f0ec08583707d54191e20c2e561e37 /app/controllers/admin/users_controller.rb | |
| parent | af930b83a097f4ab83e6361bc3c210462e507cd9 (diff) | |
| download | gitlab-ce-revert-f2421b2b.tar.gz | |
Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'"revert-f2421b2b
This reverts merge request !13619
Diffstat (limited to 'app/controllers/admin/users_controller.rb')
| -rw-r--r-- | app/controllers/admin/users_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index cbcef70e957..9ec7719fabb 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -211,7 +211,6 @@ class Admin::UsersController < Admin::ApplicationController :provider, :remember_me, :skype, - :theme_id, :twitter, :username, :website_url |