[DRE-commits] [diaspora] 01/07: remove rails 4.1 compat patches deleted: debian/patches/040-disable-raise_in_transactional_callbacks.patch deleted: debian/patches/041-require-foreigner.patch

[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 e9f4116362e21d9d20f53d20ebb77a35c2f15ae5
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Aug 27 10:34:30 2015 +0530

    remove rails 4.1 compat patches
    	deleted:    debian/patches/040-disable-raise_in_transactional_callbacks.patch
    	deleted:    debian/patches/041-require-foreigner.patch
---
 .../040-disable-raise_in_transactional_callbacks.patch    | 15 ---------------
 debian/patches/041-require-foreigner.patch                | 12 ------------
 debian/patches/series                                     |  2 --
 3 files changed, 29 deletions(-)

diff --git a/debian/patches/040-disable-raise_in_transactional_callbacks.patch b/debian/patches/040-disable-raise_in_transactional_callbacks.patch
deleted file mode 100644
index 74ca6b3..0000000
--- a/debian/patches/040-disable-raise_in_transactional_callbacks.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-to fix undefined method `raise_in_transactional_callbacks=' for ActiveRecord::Base:Class
-
-Index: diaspora/config/application.rb
-===================================================================
---- diaspora.orig/config/application.rb
-+++ diaspora/config/application.rb
-@@ -104,7 +104,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
- 
-     # Setup action mailer early
-     config.action_mailer.default_url_options = {
diff --git a/debian/patches/041-require-foreigner.patch b/debian/patches/041-require-foreigner.patch
deleted file mode 100644
index da8a624..0000000
--- a/debian/patches/041-require-foreigner.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: diaspora/config/application.rb
-===================================================================
---- diaspora.orig/config/application.rb
-+++ diaspora/config/application.rb
-@@ -2,6 +2,7 @@ require_relative 'boot'
- 
- require 'rails/all'
- Bundler.require(:default, Rails.env)
-+require 'foreigner'
- 
- # Do not dump the limit of boolean fields on MySQL,
- # since that generates a db/schema.rb that's incompatible
diff --git a/debian/patches/series b/debian/patches/series
index d949ef9..04f4622 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,4 @@
 020-loosen-minor-versions.patch
 030-loosen-tiny-versions.patch
 031-embedded-gems.patch
-040-disable-raise_in_transactional_callbacks.patch
-041-require-foreigner.patch
 043-dont-do-git-checks.patch

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