diff options
| author | Alejandro Rodríguez <alejorro70@gmail.com> | 2018-11-19 23:20:15 +0300 |
|---|---|---|
| committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2018-11-19 23:20:15 +0300 |
| commit | fd2c85f10d7a880db10d1df66ebcd46ec6d7b25a (patch) | |
| tree | aca42540cf1050b00abc94cbdcbe32deb4920e6a | |
| parent | ce7eaa29a49e35f276dde8abaffc37773c2263ea (diff) | |
| parent | f7cff1a06b7ea29f183aa79b8127641be8c238b5 (diff) | |
Merge branch 'sh-bump-tzinfo' into 'master'
Bump tzinfo to 1.2.5
See merge request gitlab-org/gitaly!977
| -rw-r--r-- | changelogs/unreleased/sh-bump-tzinfo.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/sh-bump-tzinfo.yml b/changelogs/unreleased/sh-bump-tzinfo.yml new file mode 100644 index 000000000..a7b8bd8bf --- /dev/null +++ b/changelogs/unreleased/sh-bump-tzinfo.yml @@ -0,0 +1,5 @@ +--- +title: Bump tzinfo to 1.2.5 +merge_request: 977 +author: +type: other diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index d440cb9d1..6efc10092 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -130,7 +130,7 @@ GEM stringex (2.8.4) thread_safe (0.3.6) timecop (0.9.1) - tzinfo (1.2.2) + tzinfo (1.2.5) thread_safe (~> 0.1) unicode-display_width (1.4.0) unparser (0.2.8) |