From f6b6a67729989ffe4d43a7060f193ba059e6f918 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Tue, 10 Apr 2012 10:30:52 -0700
Subject: [PATCH] this file got renamed
---
.../devise/mailer/confirmation_instructions.haml | 2 +-
.../mailer/reset_password_instructions.haml | 2 +-
app/views/devise/mailer/unlock_instructions.haml | 2 +-
features/support/env.rb | 16 ++++++++--------
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/app/views/devise/mailer/confirmation_instructions.haml b/app/views/devise/mailer/confirmation_instructions.haml
index 9b8214edd9..fb7b887759 100644
--- a/app/views/devise/mailer/confirmation_instructions.haml
+++ b/app/views/devise/mailer/confirmation_instructions.haml
@@ -5,7 +5,7 @@
= render :partial => 'notifier/notifier_css'
%body
%header
- = image_tag('branding/diaspora_white.png')
+ = image_tag('branding/white.png')
#container
%p
= t('devise.mailer.welcome', :email => @resource.email)
diff --git a/app/views/devise/mailer/reset_password_instructions.haml b/app/views/devise/mailer/reset_password_instructions.haml
index 0204a0b727..58edc94078 100644
--- a/app/views/devise/mailer/reset_password_instructions.haml
+++ b/app/views/devise/mailer/reset_password_instructions.haml
@@ -5,7 +5,7 @@
= render :partial => 'notifier/notifier_css'
%body
%header
- = image_tag('branding/diaspora_white.png')
+ = image_tag('branding/white.png')
#container
%p
= t('devise.mailer.hello', :email => @resource.email)
diff --git a/app/views/devise/mailer/unlock_instructions.haml b/app/views/devise/mailer/unlock_instructions.haml
index 40344a076e..8cdd6038ea 100644
--- a/app/views/devise/mailer/unlock_instructions.haml
+++ b/app/views/devise/mailer/unlock_instructions.haml
@@ -5,7 +5,7 @@
= render :partial => 'notifier/notifier_css'
%body
%header
- = image_tag('branding/diaspora_white.png')
+ = image_tag('branding/white.png')
#container
%p
= t('devise.mailer.hello', :email => @resource.email)
diff --git a/features/support/env.rb b/features/support/env.rb
index 2842b175ec..d88e6ffcc6 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -101,11 +101,11 @@ Spork.each_run do
end
end
-# https://makandracards.com/makandra/950-speed-up-rspec-by-deferring-garbage-collection
-require File.join(File.dirname(__FILE__), "..", "..", "spec", "support", "deferred_garbage_collection")
-Before do
- DeferredGarbageCollection.start
-end
-After do
- DeferredGarbageCollection.reconsider
-end
+# # https://makandracards.com/makandra/950-speed-up-rspec-by-deferring-garbage-collection
+# require File.join(File.dirname(__FILE__), "..", "..", "spec", "support", "deferred_garbage_collection")
+# Before do
+# DeferredGarbageCollection.start
+# end
+# After do
+# DeferredGarbageCollection.reconsider
+# end
--
GitLab