diff options
author | Ezekiel Kigbo <ekigbo@gitlab.com> | 2019-05-08 00:58:16 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2019-05-08 00:58:16 +0300 |
commit | 3ad6653b3e64ad81278cbbc24dacd15bd2d32e6f (patch) | |
tree | d481264c2003dd5f26da4f61da413d19db96c057 /app/controllers | |
parent | 9d4450263fd7dc53dafd62389871d8b1fcea5e1a (diff) |
Added user time settings fields to profile
Udpated user_edit_profile_spec with time preferences
Minor update form fields
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/profiles/preferences_controller.rb | 4 | ||||
-rw-r--r-- | app/controllers/profiles_controller.rb | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/profiles/preferences_controller.rb b/app/controllers/profiles/preferences_controller.rb index 0e30df1b15b..62f98d9e549 100644 --- a/app/controllers/profiles/preferences_controller.rb +++ b/app/controllers/profiles/preferences_controller.rb @@ -44,7 +44,9 @@ class Profiles::PreferencesController < Profiles::ApplicationController :project_view, :theme_id, :first_day_of_week, - :preferred_language + :preferred_language, + :time_display_relative, + :time_format_in_24h ] end end 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 |