[DRE-commits] [diaspora] 39/257: timeout is not an option anymore for faraday 0.9.0

[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 17c37800489f9afc33b80ee0581856b0871d7d60
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue May 6 13:32:36 2014 +0530

    timeout is not an option anymore for faraday 0.9.0
---
 debian/patches/loosen-faraday-version.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/debian/patches/loosen-faraday-version.patch b/debian/patches/loosen-faraday-version.patch
index 39ea8f2..0b2b083 100644
--- a/debian/patches/loosen-faraday-version.patch
+++ b/debian/patches/loosen-faraday-version.patch
@@ -9,3 +9,13 @@
  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
+   }

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