-
Notifications
You must be signed in to change notification settings - Fork 5.8k
Add timezone configuration to gitlab.yml #8015
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
I've prepared a stage. Click to open. |
|
I think test error not belongs to me and I can't reproduce it on my workstation. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not just remove the entire section?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because user's are using it actually. So keeping it will avoid BC breaks and the note will suggest to move to gitlab.yml file. In my opinion. ;)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it would be less confusing to just remove it and add details to upgrade guide about setting time zone.
|
Can't say that I've tested this or am able to tell if it is correct but love the idea! Perhaps also add an upgrade guide note about setting the time zone? |
|
@bbodenmiller The upgrade note does't exist yet and I already create on on another PR. Don't know if is the good way... |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does the new setting in gitlab.yml override the setting if it is also set here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, when you start GitLab, the workflow is:
- Set default time-zone (UTC)
- config.time_zone on application.rb ? Override
- time_zone on gitlab.yml ? Override
|
I still think it would be good to add upgrade guide and just handle merge conflict depending on which gets added first. Just something basic like I have in #7742. |
|
@soullivaneuh appears to be a merge conflict. Would love to see this in 7.4 and I think they stop accepting MR for that tomorrow. /cc @dosire this implements a feature request that is currently accepting MRs. |
|
I would love to see that in 7.4, too. |
5086436 to
6c50079
Compare
|
I updated the branch to be able to merge. I fixed your diff comments @bbodenmiller except for #8015 (comment), waiting for collaborator review. So, just waiting a collaborator's feedback! :) |
|
Looks interesting, @randx please review |
|
I saw you already started 7.4.0 release. Should I update the changelog to go on 7.5.x-dev ? |
|
@soullivaneuh It won't go into 7.4 but I would wait with updating until you have word from @randx to prevent you having to update it twice. |
|
OK sounds good for me. 👍 |
|
@soullivaneuh please rebase on master and ping me - I will merge it :) |
|
@randx : OK, should I put my changelog on 7.5 ? |
|
yes |
6c50079 to
593a287
Compare
|
@randx Done! :) |
Add timezone configuration to gitlab.yml
|
Thanks! |
set timezone added in gitlabhq#8015
time zone settings moved to gitlab.yml in gitlabhq#8015
Instruct user to set time zone option that was added in gitlabhq#8015
Add preliminary 7.6 upgrade guide. Makes it easier to add upgrades as changes are made rather than trying to round up everything at RC1. Initial additions: * Nginx changes needed again in 7.6 as they did not make the final 7.5 upgrade guide * Suggest that user sets time zone (added in gitlabhq#8015 but missed in final 7.5 upgrade guide) Replaces gitlabhq#8124
|
@bbodenmiller Thanks, done. |
|
When searching for "gitlab timezone" it's very easy to find all of these previously-open issues, but it's difficult to find the new documentation telling you how you're supposed to do it in the newest versions. Would someone kindly add a link to the documentation for how to set the timezone in both the cookbook and omnibus versions? For example, this change involves adding it to gitlab.yml, but shouldn't omnibus users be adding it to |
|
@JonathonReinhart I've been unable to find any docs on this as well, but figured it out for Omnibus. /etc/gitlab/gitlab.rb List of timezones here. Reconfigure and restart |
QA: Use strings for context descriptions Closes gitlabhq#8015 See merge request gitlab-org/gitlab-ee!7984
This pull request refer to this suggestion: http://feedback.gitlab.com/forums/176466-general/suggestions/5890076-add-timezone-configuration-to-gitlab-yml
It's now possible to set time zone form gitlab.yml configuration file by adding a little time_zone initializer.