summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-11-02 12:49:57 +0000
committerRémy Coutable <remy@rymai.me>2016-11-02 12:49:57 +0000
commitcd627c85d95eee2ec316e222a73145c2c5462349 (patch)
tree822e25b3f36b8c03fc875f7279fc4dd96232b171 /Gemfile
parenteee41653899da17b005df9b519dbcc01d4cc28c9 (diff)
parent5a80f5d79bfd37ccc53c5c87d805b04e4107bb6e (diff)
downloadgitlab-ce-cd627c85d95eee2ec316e222a73145c2c5462349.tar.gz
Merge branch 'update-diffy' into 'master'
Update diffy gem to 3.1.0 See merge request !7184
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 7c9d4a2f3f7..af82ae16a56 100644
--- a/Gemfile
+++ b/Gemfile
@@ -117,7 +117,7 @@ gem 'truncato', '~> 0.7.8'
gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2'
# Diffs
-gem 'diffy', '~> 3.0.3'
+gem 'diffy', '~> 3.1.0'
# Application server
group :unicorn do