From b46c6d1c950aea672c5fa7bf091cfcbbda86f418 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 22 Nov 2019 20:00:04 +0000 Subject: [PATCH] Revert "Merge branch 'sh-upgrade-charlock-holmes' into 'master'" This reverts merge request !1647 --- changelogs/unreleased/sh-upgrade-charlock-holmes.yml | 5 ----- ruby/Gemfile.lock | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 changelogs/unreleased/sh-upgrade-charlock-holmes.yml diff --git a/changelogs/unreleased/sh-upgrade-charlock-holmes.yml b/changelogs/unreleased/sh-upgrade-charlock-holmes.yml deleted file mode 100644 index 149b9819db..0000000000 --- a/changelogs/unreleased/sh-upgrade-charlock-holmes.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -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 f8a8d4ed9c..90c4e1bcce 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.7) + charlock_holmes (0.7.6) coderay (1.1.2) concord (0.1.5) adamantium (~> 0.2.0) -- GitLab