Commit 4290ae55 authored by Jan Provaznik's avatar Jan Provaznik

Merge branch 'pravi/gitlab-update-diffy' into 'master'

Update diffy rubygem 3.1 -> 3.3

See merge request gitlab-org/gitlab!25805
parents 82197e99 1ac57479
......@@ -159,7 +159,7 @@ gem 'escape_utils', '~> 1.1'
gem 'icalendar'
# Diffs
gem 'diffy', '~> 3.1.0'
gem 'diffy', '~> 3.3'
gem 'diff_match_patch', '~> 0.1.0'
# Application server
......
......@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment