From 120b46931d61c463f817c634df3737a00eacf3ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Thu, 11 Dec 2014 20:10:20 +0100
Subject: [PATCH] Disable spring while generating secret token

That causes a cyclic dependency on spring being
loaded otherwise.
---
 lib/configuration_methods.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/configuration_methods.rb b/lib/configuration_methods.rb
index 2daa0ed4c..9c302b794 100644
--- a/lib/configuration_methods.rb
+++ b/lib/configuration_methods.rb
@@ -46,7 +46,7 @@ module Configuration
           File.dirname(__FILE__)
         )
         unless File.exist? token_file
-          `bin/rake generate:secret_token`
+          `DISABLE_SPRING=1 bin/rake generate:secret_token`
         end
         require token_file
         Diaspora::Application.config.secret_key_base