Skip to content

Conversation

@soullivaneuh
Copy link
Contributor

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.

@TeatroIO
Copy link

I've prepared a stage. Click to open.

@soullivaneuh
Copy link
Contributor Author

I think test error not belongs to me and I can't reproduce it on my workstation.

Copy link
Contributor

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?

Copy link
Contributor Author

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. ;)

Copy link
Contributor

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.

@bbodenmiller
Copy link
Contributor

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?

@soullivaneuh
Copy link
Contributor Author

@bbodenmiller The upgrade note does't exist yet and I already create on on another PR. Don't know if is the good way...

Copy link
Contributor

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?

Copy link
Contributor Author

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

@bbodenmiller
Copy link
Contributor

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.

@bbodenmiller
Copy link
Contributor

@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.

@mattweb
Copy link

mattweb commented Oct 15, 2014

I would love to see that in 7.4, too.

@soullivaneuh
Copy link
Contributor Author

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! :)

@dosire
Copy link
Member

dosire commented Oct 15, 2014

Looks interesting, @randx please review

@soullivaneuh
Copy link
Contributor Author

I saw you already started 7.4.0 release.

Should I update the changelog to go on 7.5.x-dev ?

@dosire
Copy link
Member

dosire commented Oct 21, 2014

@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.

@soullivaneuh
Copy link
Contributor Author

OK sounds good for me. 👍

@dzaporozhets
Copy link
Contributor

@soullivaneuh please rebase on master and ping me - I will merge it :)

@soullivaneuh
Copy link
Contributor Author

@randx : OK, should I put my changelog on 7.5 ?

@dzaporozhets
Copy link
Contributor

yes

@soullivaneuh
Copy link
Contributor Author

@randx Done! :)

dzaporozhets added a commit that referenced this pull request Oct 21, 2014
Add timezone configuration to gitlab.yml
@dzaporozhets dzaporozhets merged commit 31de763 into gitlabhq:master Oct 21, 2014
@dzaporozhets
Copy link
Contributor

Thanks!

@soullivaneuh soullivaneuh deleted the server-timezone branch October 21, 2014 10:05
bbodenmiller added a commit to bbodenmiller/gitlabhq that referenced this pull request Oct 21, 2014
set timezone added in gitlabhq#8015
@bbodenmiller bbodenmiller mentioned this pull request Oct 21, 2014
bbodenmiller added a commit to bbodenmiller/gitlabhq that referenced this pull request Oct 21, 2014
time zone settings moved to gitlab.yml in gitlabhq#8015
bbodenmiller added a commit to bbodenmiller/gitlabhq that referenced this pull request Oct 21, 2014
Instruct user to set time zone option that was added in gitlabhq#8015
@bbodenmiller bbodenmiller mentioned this pull request Oct 21, 2014
@bbodenmiller
Copy link
Contributor

bbodenmiller added a commit to bbodenmiller/gitlabhq that referenced this pull request Nov 23, 2014
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
@dosire
Copy link
Member

dosire commented Dec 1, 2014

@bbodenmiller Thanks, done.

@JonathonReinhart
Copy link
Contributor

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 /etc/gitlab/gitlab.rb? Because /opt/gitlab/embedded/service/gitlab-rails/config/gitlab.yml indicates that /etc/gitlab/gitlab.rb is where changes should be made.

@snobear
Copy link

snobear commented Feb 4, 2015

@JonathonReinhart I've been unable to find any docs on this as well, but figured it out for Omnibus.

/etc/gitlab/gitlab.rb

gitlab_rails['time_zone'] = 'America/New_York'

List of timezones here.

Reconfigure and restart

sudo gitlab-ctl reconfigure
sudo gitlab-ctl restart

tigefa4u pushed a commit to tigefa4u/gitlabhq that referenced this pull request Nov 6, 2018
QA: Use strings for context descriptions

Closes gitlabhq#8015

See merge request gitlab-org/gitlab-ee!7984
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

8 participants