[DRE-commits] [redmine] 03/07: Refresh patches

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository redmine.

commit 821cf5bdc5837e50d9b3871360b80cb3e1e138f8
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Nov 12 19:16:29 2016 -0200

    Refresh patches
---
 debian/changelog                                          | 1 +
 debian/patches/0001-Gemfile-relax-some-dependencies.patch | 8 ++++----
 debian/patches/0002-Force-table-encoding-in-mysql.patch   | 2 +-
 debian/patches/0004-Add-multi-tenancy-support.patch       | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1dd9d55..edf9077 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 redmine (3.3.1-1) UNRELEASED; urgency=medium
 
   * New upstream release
+    + Refresh patches
   * debian/README.Debian: note that rake commands must be run from inside
     /usr/share/redmine
 
diff --git a/debian/patches/0001-Gemfile-relax-some-dependencies.patch b/debian/patches/0001-Gemfile-relax-some-dependencies.patch
index 04adb33..aa470db 100644
--- a/debian/patches/0001-Gemfile-relax-some-dependencies.patch
+++ b/debian/patches/0001-Gemfile-relax-some-dependencies.patch
@@ -7,18 +7,18 @@ Subject: Gemfile: relax some dependencies
  1 file changed, 8 insertions(+), 23 deletions(-)
 
 diff --git a/Gemfile b/Gemfile
-index a632dbd..828ce70 100644
+index 3a4572e..5b2a620 100644
 --- a/Gemfile
 +++ b/Gemfile
 @@ -4,12 +4,12 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.5.0')
    abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'."
  end
  
--gem "rails", "4.2.5.2"
+-gem "rails", "4.2.7.1"
 -gem "jquery-rails", "~> 3.1.4"
-+gem "rails", "~> 4.2.5"
++gem "rails", "~> 4.2.7"
 +gem "jquery-rails", "~> 4.0"
- gem "coderay", "~> 1.1.0"
+ gem "coderay", "~> 1.1.1"
  gem "builder", ">= 3.0.4"
 -gem "request_store", "1.0.5"
 -gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99")
diff --git a/debian/patches/0002-Force-table-encoding-in-mysql.patch b/debian/patches/0002-Force-table-encoding-in-mysql.patch
index 2e4b41c..42cb07d 100644
--- a/debian/patches/0002-Force-table-encoding-in-mysql.patch
+++ b/debian/patches/0002-Force-table-encoding-in-mysql.patch
@@ -11,7 +11,7 @@ in database.yml Forwarded: not-needed
  1 file changed, 15 insertions(+)
 
 diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb
-index dae04fc..7837223 100644
+index ef8b930..9a2ae43 100644
 --- a/config/initializers/10-patches.rb
 +++ b/config/initializers/10-patches.rb
 @@ -1,4 +1,19 @@
diff --git a/debian/patches/0004-Add-multi-tenancy-support.patch b/debian/patches/0004-Add-multi-tenancy-support.patch
index 58df948..d24f6fb 100644
--- a/debian/patches/0004-Add-multi-tenancy-support.patch
+++ b/debian/patches/0004-Add-multi-tenancy-support.patch
@@ -47,7 +47,7 @@ index 173b030..d9e39ef 100644
  /lib/redmine/scm/adapters/mercurial/redminehelper.pyo
  /log/*.log*
 diff --git a/Gemfile b/Gemfile
-index 828ce70..bff7860 100644
+index 5b2a620..cd8a13f 100644
 --- a/Gemfile
 +++ b/Gemfile
 @@ -59,12 +59,17 @@ end
@@ -80,7 +80,7 @@ index 828ce70..bff7860 100644
  
  local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
 diff --git a/app/models/attachment.rb b/app/models/attachment.rb
-index 3d16f57..25fd394 100644
+index 4bc674f..2c340a3 100644
 --- a/app/models/attachment.rb
 +++ b/app/models/attachment.rb
 @@ -47,10 +47,10 @@ class Attachment < ActiveRecord::Base
@@ -95,7 +95,7 @@ index 3d16f57..25fd394 100644
 +  @@thumbnails_storage_path = File.join(Redmine.root, "tmp", "thumbnails")
  
    before_create :files_to_final_location
-   after_commit :delete_from_disk, :on => :destroy
+   after_rollback :delete_from_disk, :on => :create
 diff --git a/bin/redmine-instances b/bin/redmine-instances
 new file mode 100755
 index 0000000..ab04b47

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