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

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-11-22 23:00:04 +0300
committerStan Hu <stanhu@gmail.com>2019-11-22 23:00:04 +0300
commitb46c6d1c950aea672c5fa7bf091cfcbbda86f418 (patch)
treebee302f30b2eb64c99d5a5b005437de3a3c7d649
parentf756ebe2f9b8b12ea2a6922f2833e5edc5055db9 (diff)
Revert "Merge branch 'sh-upgrade-charlock-holmes' into 'master'"
This reverts merge request !1647
-rw-r--r--changelogs/unreleased/sh-upgrade-charlock-holmes.yml5
-rw-r--r--ruby/Gemfile.lock2
2 files changed, 1 insertions, 6 deletions
diff --git a/changelogs/unreleased/sh-upgrade-charlock-holmes.yml b/changelogs/unreleased/sh-upgrade-charlock-holmes.yml
deleted file mode 100644
index 149b9819d..000000000
--- 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 f8a8d4ed9..90c4e1bcc 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)