nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

this file got renamed

Browse source
This commit is contained in:
Maxwell Salzberg 2012-04-10 10:30:52 -07:00
parent 79acc2c4cf
commit f6b6a67729
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/devise/mailer/confirmation_instructions.haml
View file

@ -5,7 +5,7 @@
= render :partial => 'notifier/notifier_css' = render :partial => 'notifier/notifier_css'
%body %body
%header %header
= image_tag('branding/diaspora_white.png') = image_tag('branding/white.png')
#container #container
%p %p
= t('devise.mailer.welcome', :email => @resource.email) = t('devise.mailer.welcome', :email => @resource.email)

2
app/views/devise/mailer/reset_password_instructions.haml
View file

@ -5,7 +5,7 @@
= render :partial => 'notifier/notifier_css' = render :partial => 'notifier/notifier_css'
%body %body
%header %header
= image_tag('branding/diaspora_white.png') = image_tag('branding/white.png')
#container #container
%p %p
= t('devise.mailer.hello', :email => @resource.email) = t('devise.mailer.hello', :email => @resource.email)

2
app/views/devise/mailer/unlock_instructions.haml
View file

@ -5,7 +5,7 @@
= render :partial => 'notifier/notifier_css' = render :partial => 'notifier/notifier_css'
%body %body
%header %header
= image_tag('branding/diaspora_white.png') = image_tag('branding/white.png')
#container #container
%p %p
= t('devise.mailer.hello', :email => @resource.email) = t('devise.mailer.hello', :email => @resource.email)

16
features/support/env.rb
View file

@ -101,11 +101,11 @@ Spork.each_run do
end end
end end
# https://makandracards.com/makandra/950-speed-up-rspec-by-deferring-garbage-collection # # https://makandracards.com/makandra/950-speed-up-rspec-by-deferring-garbage-collection
require File.join(File.dirname(__FILE__), "..", "..", "spec", "support", "deferred_garbage_collection") # require File.join(File.dirname(__FILE__), "..", "..", "spec", "support", "deferred_garbage_collection")
Before do # Before do
DeferredGarbageCollection.start # DeferredGarbageCollection.start
end # end
After do # After do
DeferredGarbageCollection.reconsider # DeferredGarbageCollection.reconsider
end # end