Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCollen <collen@gitlab.com>2018-07-10 18:22:13 +0300
committerKamil TrzciƄski <ayufan@ayufan.eu>2018-07-10 18:22:13 +0300
commit798608af94f092dd6289b7da0f57bd1c8307e2f0 (patch)
treecdcde46e9af7a2176fe92d56b28029f584bdcb68
parentb40e71d6f3c71cd7d46bb64561ee2b291b3f8394 (diff)
Add daylight saving time support for pipeline schedules
-rw-r--r--app/helpers/pipeline_schedules_helper.rb2
-rw-r--r--changelogs/unreleased/add-dst-support-to-pipeline-schedule.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/helpers/pipeline_schedules_helper.rb b/app/helpers/pipeline_schedules_helper.rb
index 6edaf78de1b..4b9f6bd2caf 100644
--- a/app/helpers/pipeline_schedules_helper.rb
+++ b/app/helpers/pipeline_schedules_helper.rb
@@ -3,7 +3,7 @@ module PipelineSchedulesHelper
ActiveSupport::TimeZone.all.map do |timezone|
{
name: timezone.name,
- offset: timezone.utc_offset,
+ offset: timezone.now.utc_offset,
identifier: timezone.tzinfo.identifier
}
end
diff --git a/changelogs/unreleased/add-dst-support-to-pipeline-schedule.yml b/changelogs/unreleased/add-dst-support-to-pipeline-schedule.yml
new file mode 100644
index 00000000000..08376014ad7
--- /dev/null
+++ b/changelogs/unreleased/add-dst-support-to-pipeline-schedule.yml
@@ -0,0 +1,5 @@
+---
+title: Add support for daylight savings time to pipleline schedules
+merge_request: 20145
+author:
+type: fixed