[DRE-commits] [diaspora] 10/11: refresh patches

[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 028602a3e04bcb9b17a6e5b5857500055a6652ef
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed May 6 13:10:11 2015 +0530

    refresh patches
---
 debian/patches/040-disable-raise_in_transactional_callbacks.patch | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/patches/040-disable-raise_in_transactional_callbacks.patch b/debian/patches/040-disable-raise_in_transactional_callbacks.patch
index ddc4e46..39fec93 100644
--- a/debian/patches/040-disable-raise_in_transactional_callbacks.patch
+++ b/debian/patches/040-disable-raise_in_transactional_callbacks.patch
@@ -4,11 +4,12 @@ Index: diaspora/config/application.rb
 ===================================================================
 --- diaspora.orig/config/application.rb
 +++ diaspora/config/application.rb
-@@ -101,6 +101,6 @@ module Diaspora
+@@ -101,7 +101,7 @@ module Diaspora
      end
  
      # Will be default with Rails 5
 -    config.active_record.raise_in_transactional_callbacks = true
 +    #config.active_record.raise_in_transactional_callbacks = true
-   end
- end
+ 
+     # Setup action mailer early
+     config.action_mailer.default_url_options = {

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