Merge branch 'update-diffy' into 'master'

Update diffy gem to 3.1.0 See merge request !7184

Merge branch 'update-diffy' into 'master'
cd627c85 · Rémy Coutable · eee41653 · 5a80f5d7 · cd627c85 · cd627c85
Commit cd627c85 authored Nov 02, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- 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

--- 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)