diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 12:08:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 12:08:48 +0000 |
| commit | f7dae0cdcb70ecb71c1d65f099e9d96b27a4548c (patch) | |
| tree | e53baffa847c4fd37c8e335e4d93d603c75f9f02 /Gemfile.lock | |
| parent | b98fa9ef3d5bead417ae2f325cb64637883264e9 (diff) | |
| download | gitlab-ce-f7dae0cdcb70ecb71c1d65f099e9d96b27a4548c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 5fe50053428..f90507ba23a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -237,7 +237,7 @@ GEM rotp (~> 2.0) diff-lcs (1.3) diff_match_patch (0.1.0) - diffy (3.1.0) + diffy (3.3.0) discordrb-webhooks-blackst0ne (3.3.0) rest-client (~> 2.0) docile (1.3.1) @@ -1195,7 +1195,7 @@ DEPENDENCIES devise (~> 4.6) devise-two-factor (~> 3.1.0) diff_match_patch (~> 0.1.0) - diffy (~> 3.1.0) + diffy (~> 3.3) discordrb-webhooks-blackst0ne (~> 3.3) doorkeeper (~> 5.0.2) doorkeeper-openid_connect (~> 1.6.3) |