From bec3e2c92bb4f3ca55303717591cba7fb2277994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <mrzyx@mrzyx.de>
Date: Sun, 15 Jan 2012 02:49:14 +0100
Subject: [PATCH] set faradays timeout 25

---
 config/initializers/faraday.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/faraday.rb b/config/initializers/faraday.rb
index aac11e4cb..9a2683507 100644
--- a/config/initializers/faraday.rb
+++ b/config/initializers/faraday.rb
@@ -1,7 +1,7 @@
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
-options = {:timeout => 5}
+options = {:timeout => 25}
 
 options[:ssl] = {:ca_file => EnviromentConfiguration.ca_cert_file_location}
 Faraday.default_connection = Faraday::Connection.new(options) do |b|