Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEzekiel Kigbo <ekigbo@gitlab.com>2019-05-08 00:58:16 +0300
committerFatih Acet <acetfatih@gmail.com>2019-05-08 00:58:16 +0300
commit3ad6653b3e64ad81278cbbc24dacd15bd2d32e6f (patch)
treed481264c2003dd5f26da4f61da413d19db96c057 /app/controllers/profiles
parent9d4450263fd7dc53dafd62389871d8b1fcea5e1a (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/profiles')
-rw-r--r--app/controllers/profiles/preferences_controller.rb4
1 files changed, 3 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