summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorManuel Rüger <manuel@rueg.eu>2016-10-29 02:29:42 +0200
committerManuel Rüger <manuel@rueg.eu>2016-10-31 23:04:13 +0100
commit5a80f5d79bfd37ccc53c5c87d805b04e4107bb6e (patch)
tree95de21b726a0f8eae36620fc5d799a3f587d46a2 /Gemfile.lock
parentb216d9bf85388e34891e392d8c80e72643d639c0 (diff)
downloadgitlab-ce-5a80f5d79bfd37ccc53c5c87d805b04e4107bb6e.tar.gz
Update diffy gem to 3.1.0
ChangeLog: https://github.com/samg/diffy/blob/master/CHANGELOG
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index f8116e1894f..68ee206a818 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -180,7 +180,7 @@ GEM
railties
rotp (~> 2.0)
diff-lcs (1.2.5)
- diffy (3.0.7)
+ diffy (3.1.0)
docile (1.1.5)
doorkeeper (4.2.0)
railties (>= 4.2)
@@ -847,7 +847,7 @@ DEPENDENCIES
default_value_for (~> 3.0.0)
devise (~> 4.2)
devise-two-factor (~> 3.0.0)
- diffy (~> 3.0.3)
+ diffy (~> 3.1.0)
doorkeeper (~> 4.2.0)
dropzonejs-rails (~> 0.7.1)
email_reply_parser (~> 0.5.8)