diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2019-11-25 19:55:24 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2019-11-25 19:55:24 +0300 |
| commit | 52fba27d9fdee4a9d2403eaee49f4005df6ba67d (patch) | |
| tree | 5302f0a9ae9683938c04760cc441a1f6fe4c7b3f | |
| parent | ac5d0445497a3f23b86ffaf72ca790cbff094073 (diff) | |
| parent | b46c6d1c950aea672c5fa7bf091cfcbbda86f418 (diff) | |
Merge branch 'revert-da257b59' into 'master'
Revert "Merge branch 'sh-upgrade-charlock-holmes' into 'master'"
See merge request gitlab-org/gitaly!1652
| -rw-r--r-- | ruby/Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
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) |