diff options
| author | John Cai <jcai@gitlab.com> | 2019-11-22 01:43:04 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-11-22 01:43:04 +0300 |
| commit | da257b59a5d74b0f94a4a493d0ef94e226c951c4 (patch) | |
| tree | 699e22e625e342a0c0ed8adbdd853a308b03893a | |
| parent | 6329ea35fc2682718a26853c692fd6c32a8636e6 (diff) | |
| parent | 705f1e2b40a0fa72fb78e80d8b1b81de43e1015b (diff) | |
Merge branch 'sh-upgrade-charlock-holmes' into 'master'
Upgrade charlock_holmes Ruby gem to v0.7.7
See merge request gitlab-org/gitaly!1647
| -rw-r--r-- | changelogs/unreleased/sh-upgrade-charlock-holmes.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/sh-upgrade-charlock-holmes.yml b/changelogs/unreleased/sh-upgrade-charlock-holmes.yml new file mode 100644 index 000000000..149b9819d --- /dev/null +++ b/changelogs/unreleased/sh-upgrade-charlock-holmes.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade charlock_holmes Ruby gem to v0.7.7 +merge_request: 1647 +author: +type: other diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 90c4e1bcc..f8a8d4ed9 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -28,7 +28,7 @@ GEM ast (2.4.0) binding_ninja (0.2.3) builder (3.2.3) - charlock_holmes (0.7.6) + charlock_holmes (0.7.7) coderay (1.1.2) concord (0.1.5) adamantium (~> 0.2.0) |