diff options
| author | John Cai <jcai@gitlab.com> | 2020-01-22 03:06:22 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2020-01-22 03:06:22 +0300 |
| commit | 1f64bffe166aff627e2f23ffe8e87742b9aa61e1 (patch) | |
| tree | f1525142cb6dbac8b5957ef7ab86b14007b9d0ec | |
| parent | 4954041302f15c75f080a807e0525b85b343ea8e (diff) | |
| parent | bbcb82fd81e886e924c3d7f3e31bfe866a8ba9e1 (diff) | |
Merge branch 'sh-update-tzinfo' into 'master'
Update tzinfo gem to v1.2.6
See merge request gitlab-org/gitaly!1762
| -rw-r--r-- | changelogs/unreleased/sh-update-tzinfo.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/sh-update-tzinfo.yml b/changelogs/unreleased/sh-update-tzinfo.yml new file mode 100644 index 000000000..8cf0cdb8b --- /dev/null +++ b/changelogs/unreleased/sh-update-tzinfo.yml @@ -0,0 +1,5 @@ +--- +title: Update tzinfo gem to v1.2.6 +merge_request: 1762 +author: +type: other diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index c095ad39f..01a06be82 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -192,7 +192,7 @@ GEM thread_safe (0.3.6) thrift (0.11.0.0) timecop (0.9.1) - tzinfo (1.2.5) + tzinfo (1.2.6) thread_safe (~> 0.1) unicode-display_width (1.6.0) unparser (0.4.5) |