BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
593a287c
Commit
593a287c
authored
Oct 11, 2014
by
Sullivan SENECHAL
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add timezone configuration to gitlab.yml
parent
ee068e76
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
0 deletions
+11
-0
CHANGELOG
CHANGELOG
+3
-0
application.rb
config/application.rb
+1
-0
gitlab.yml.example
config/gitlab.yml.example
+5
-0
1_settings.rb
config/initializers/1_settings.rb
+1
-0
time_zone.rb
config/initializers/time_zone.rb
+1
-0
No files found.
CHANGELOG
View file @
593a287c
v 7.5.0
- Add time zone configuration on gitlab.yml (Sullivan Senechal)
v 7.4.0
- Refactored membership logic
- Improve error reporting on users API (Julien Bianchi)
...
...
config/application.rb
View file @
593a287c
...
...
@@ -25,6 +25,7 @@ module Gitlab
# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
# NOTE: Please prefer set time zone on config/gitlab.yml configuration file.
# config.time_zone = 'Central Time (US & Canada)'
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
...
...
config/gitlab.yml.example
View file @
593a287c
...
...
@@ -33,6 +33,11 @@ production: &base
# Uncomment and customize if you can't use the default user to run GitLab (default: 'git')
# user: git
## Date & Time settings
# Uncomment and customize if you want to change the default time zone of GitLab application.
# To see all available zones, run `bundle exec rake time:zones:all`
# time_zone: 'UTC'
## Email settings
# Email address used in the "From" field in mails sent by GitLab
email_from: example@example.com
...
...
config/initializers/1_settings.rb
View file @
593a287c
...
...
@@ -103,6 +103,7 @@ Settings.gitlab['user_home'] ||= begin
rescue
ArgumentError
# no user configured
'/home/'
+
Settings
.
gitlab
[
'user'
]
end
Settings
.
gitlab
[
'time_zone'
]
||=
nil
Settings
.
gitlab
[
'signup_enabled'
]
||=
false
Settings
.
gitlab
[
'signin_enabled'
]
||=
true
if
Settings
.
gitlab
[
'signin_enabled'
].
nil?
Settings
.
gitlab
[
'restricted_visibility_levels'
]
=
Settings
.
send
(
:verify_constant_array
,
Gitlab
::
VisibilityLevel
,
Settings
.
gitlab
[
'restricted_visibility_levels'
],
[])
...
...
config/initializers/time_zone.rb
0 → 100644
View file @
593a287c
Time
.
zone
=
Gitlab
.
config
.
gitlab
.
time_zone
||
Time
.
zone
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment