diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-02 12:49:57 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-02 12:49:57 +0000 |
| commit | cd627c85d95eee2ec316e222a73145c2c5462349 (patch) | |
| tree | 822e25b3f36b8c03fc875f7279fc4dd96232b171 | |
| parent | eee41653899da17b005df9b519dbcc01d4cc28c9 (diff) | |
| parent | 5a80f5d79bfd37ccc53c5c87d805b04e4107bb6e (diff) | |
| download | gitlab-ce-cd627c85d95eee2ec316e222a73145c2c5462349.tar.gz | |
Merge branch 'update-diffy' into 'master'
Update diffy gem to 3.1.0
See merge request !7184
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index 79c828ff0f2..888fa6b2bf5 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) |