diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-15 12:06:12 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-15 12:06:12 +0000 |
| commit | 3fc9a8e6957ddf75576dc63069c4c0249514499f (patch) | |
| tree | 003e30463853843d6fb736a9396c7eb53a3dfc9a /Gemfile.lock | |
| parent | e24153b0cb080b1b25076f8fd358b4273848f2e2 (diff) | |
| download | gitlab-ce-3fc9a8e6957ddf75576dc63069c4c0249514499f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7582eb28e49..5951eb4bf71 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -224,6 +224,7 @@ GEM railties rotp (~> 2.0) diff-lcs (1.3) + diff_match_patch (0.1.0) diffy (3.1.0) discordrb-webhooks-blackst0ne (3.3.0) rest-client (~> 2.0) @@ -1133,6 +1134,7 @@ DEPENDENCIES device_detector devise (~> 4.6) devise-two-factor (~> 3.0.0) + diff_match_patch (~> 0.1.0) diffy (~> 3.1.0) discordrb-webhooks-blackst0ne (~> 3.3) doorkeeper (~> 4.3) |