summaryrefslogtreecommitdiff
path: root/app/controllers/profiles_controller.rb
diff options
context:
space:
mode:
authorEzekiel Kigbo <ekigbo@gitlab.com>2019-05-07 21:58:16 +0000
committerFatih Acet <acetfatih@gmail.com>2019-05-07 21:58:16 +0000
commit3ad6653b3e64ad81278cbbc24dacd15bd2d32e6f (patch)
treed481264c2003dd5f26da4f61da413d19db96c057 /app/controllers/profiles_controller.rb
parent9d4450263fd7dc53dafd62389871d8b1fcea5e1a (diff)
downloadgitlab-ce-3ad6653b3e64ad81278cbbc24dacd15bd2d32e6f.tar.gz
Added user time settings fields to profile
Udpated user_edit_profile_spec with time preferences Minor update form fields
Diffstat (limited to 'app/controllers/profiles_controller.rb')
-rw-r--r--app/controllers/profiles_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index b9c52618d4b..d3746248bd3 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -106,6 +106,7 @@ class ProfilesController < Profiles::ApplicationController
:organization,
:private_profile,
:include_private_contributions,
+ :timezone,
status: [:emoji, :message]
)
end