summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJob van der Voort <job@gitlab.com>2015-05-22 07:30:43 +0000
committerJob van der Voort <job@gitlab.com>2015-05-22 07:30:43 +0000
commit906f958f897d7dcc7cfac867dff316217ea9c779 (patch)
tree5fec0101240471956450796800d031278c37070d
parent3a3f4b41e67485e62b2e37cc395f3407b30a7d9e (diff)
parent1132b3e8dc2c17a1999ec7f8bc06a0d3c810c9e1 (diff)
downloadgitlab-ce-906f958f897d7dcc7cfac867dff316217ea9c779.tar.gz
Merge branch 'timezones' into 'master'
Changing your time zone Added doc and link in workflow to how to change your time zone in Gitlab. I used the following documents as reference. Please double check that the instructions I wrote are correct. http://www.borngeek.com/2015/02/27/setting-the-time-zone-in-gitlab/ https://gitlab.com/gitlab-org/gitlab-ce/issues/443 I found that several users have this same issue, that they don't know how to change their time zone: https://github.com/gitlabhq/gitlabhq/issues/5555 https://gitlab.com/gitlab-org/omnibus-gitlab/issues/347 https://gitlab.com/gitlab-org/gitlab-ce/issues/56 http://jonathonreinhart.blogspot.com/2014/10/gitlab-time-zone-issues.html http://stackoverflow.com/questions/5073917/why-doesnt-config-time-zone-seem-to-do-anything See merge request !1827
-rw-r--r--doc/workflow/README.md3
-rw-r--r--doc/workflow/timezone.md18
2 files changed, 20 insertions, 1 deletions
diff --git a/doc/workflow/README.md b/doc/workflow/README.md
index 7e996dc47d4..b90a6a50af9 100644
--- a/doc/workflow/README.md
+++ b/doc/workflow/README.md
@@ -12,4 +12,5 @@
- [Project importing from GitHub to GitLab](import_projects_from_github.md)
- [Project importing from GitLab.com to your private GitLab instance](import_projects_from_gitlab_com.md)
- [Protected branches](protected_branches.md)
-- [Web Editor](web_editor.md)
+- [Change your time zone](timezone.md)
+- [Web Editor](web_editor.md) \ No newline at end of file
diff --git a/doc/workflow/timezone.md b/doc/workflow/timezone.md
new file mode 100644
index 00000000000..b513088dbc5
--- /dev/null
+++ b/doc/workflow/timezone.md
@@ -0,0 +1,18 @@
+# Changing your time zone
+
+GitLab defaults its time zone to UTC. It has a global timezone configuration parameter in config/application.rb.
+
+To update, add the time zone that best applies to your location. Here are two examples:
+```
+gitlab_rails['time_zone'] = 'America/New_York'
+```
+or
+```
+gitlab_rails['time_zone'] = 'Europe/Brussels'
+```
+
+After you added this field, reconfigure and restart:
+```
+gitlab-ctl reconfigure
+gitlab-ctl restart
+``` \ No newline at end of file