[DRE-commits] [diaspora] 68/257: remove loosen-faraday-version.patch

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora.

commit 0c74eac0ff33ccbff86b7d4ffc1989331aa925c1
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Nov 19 00:32:34 2014 +0530

    remove loosen-faraday-version.patch
---
 debian/patches/loosen-faraday-version.patch | 24 ------------------------
 debian/patches/series                       |  1 -
 2 files changed, 25 deletions(-)

diff --git a/debian/patches/loosen-faraday-version.patch b/debian/patches/loosen-faraday-version.patch
deleted file mode 100644
index 73d09ee..0000000
--- a/debian/patches/loosen-faraday-version.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Use newer faraday versions
-Bug: https://github.com/diaspora/diaspora/issues/4950
-
---- a/Gemfile
-+++ b/Gemfile
-@@ -90,7 +90,7 @@
- # URIs and HTTP
- 
- gem 'addressable',        '2.3.5', :require => 'addressable/uri'
--gem 'faraday',            '0.8.9'
-+gem 'faraday',            '>= 0.8.9'
- gem 'faraday_middleware', '0.9.0'
- gem 'typhoeus',           '0.6.7'
- 
---- a/config/initializers/faraday.rb
-+++ b/config/initializers/faraday.rb
-@@ -2,7 +2,6 @@
- #   licensed under the Affero General Public License version 3 or later.  See
- #   the COPYRIGHT file.
- options = {
--  timeout: 25,
-   ssl: {
-     ca_file: AppConfig.environment.certificate_authorities.get
-   }
diff --git a/debian/patches/series b/debian/patches/series
index 86be1fb..2921fa8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@ remove-gemfile-lock.patch
 006-loosen-messagebus-ruby-api-version.patch
 007-loosen-roxml-version.patch
 008-loosen-twitter-version.patch
-loosen-faraday-version.patch
 loosen-fraraday-middleware-version.patch
 loosen-typhoeus-version.patch
 loosen-gon-version.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git