summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-28 16:09:58 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-28 16:09:58 +0200
commit0c7da9d534ae91a37cbea4ba80e21d77aa3b973c (patch)
treec8d9e97db724d9374d24941ca70c02f8ad88f6f5
parent549881152a95ae51c4627e71cc5062b2d9013d6a (diff)
parent91f2d3c22918d62a22ff76ec72fddd0a0d672b79 (diff)
downloadgitlab-ce-0c7da9d534ae91a37cbea4ba80e21d77aa3b973c.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r--doc/workflow/timezone.md18
1 files changed, 15 insertions, 3 deletions
diff --git a/doc/workflow/timezone.md b/doc/workflow/timezone.md
index 8540ccfcabb..7e08c0e51ac 100644
--- a/doc/workflow/timezone.md
+++ b/doc/workflow/timezone.md
@@ -1,10 +1,22 @@
# Changing your time zone
-GitLab defaults its time zone to UTC. It has a global timezone configuration parameter in /etc/gitlab/gitlab.rb
+The global time zone configuration parameter can be changed in `config/gitlab.yml`:
+```
+ # time_zone: 'UTC'
+```
+
+Uncomment and customize if you want to change the default time zone of GitLab application.
+
+To see all available time zones, run `bundle exec rake time:zones:all`.
+
+
+## Changing time zone in omnibus installations
+
+GitLab defaults its time zone to UTC. It has a global timezone configuration parameter in `/etc/gitlab/gitlab.rb`.
To update, add the time zone that best applies to your location. Here are two examples:
```
-gitlab_rails['time_zone'] = 'America/New_York'
+gitlab_rails['time_zone'] = 'America/New_York'
```
or
```
@@ -15,4 +27,4 @@ After you added this field, reconfigure and restart:
```
gitlab-ctl reconfigure
gitlab-ctl restart
-``` \ No newline at end of file
+```