[DRE-commits] [redmine] 33/39: 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 430f8e63901b8a11caf0141416f92ab4d8c452bc
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Oct 5 17:35:02 2015 -0300

    refresh patches
---
 .../patches/0001-Gemfile-relax-some-dependencies.patch   | 16 +++++++++-------
 debian/patches/0004-Add-multi-tenancy-support.patch      |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/patches/0001-Gemfile-relax-some-dependencies.patch b/debian/patches/0001-Gemfile-relax-some-dependencies.patch
index ce6b4a4..235e2e9 100644
--- a/debian/patches/0001-Gemfile-relax-some-dependencies.patch
+++ b/debian/patches/0001-Gemfile-relax-some-dependencies.patch
@@ -3,18 +3,20 @@ Date: Tue, 25 Aug 2015 18:15:22 -0300
 Subject: Gemfile: relax some dependencies
 
 ---
- Gemfile | 25 +++++--------------------
- 1 file changed, 5 insertions(+), 20 deletions(-)
+ Gemfile | 27 ++++++---------------------
+ 1 file changed, 6 insertions(+), 21 deletions(-)
 
 diff --git a/Gemfile b/Gemfile
-index db1abbb..3e45286 100644
+index ea4136d..24d8257 100644
 --- a/Gemfile
 +++ b/Gemfile
-@@ -5,10 +5,10 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.5.0')
+@@ -4,11 +4,11 @@ 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.3"
+-gem "rails", "4.2.4"
 -gem "jquery-rails", "~> 3.1.3"
++gem "rails", "~> 4.2.4"
 +gem "jquery-rails", "~> 4.0"
  gem "coderay", "~> 1.1.0"
  gem "builder", ">= 3.0.4"
@@ -42,8 +44,8 @@ index db1abbb..3e45286 100644
  
    # Optional Markdown support, not for JRuby
    group :markdown do
--    gem "redcarpet", "~> 3.1.2"
-+    gem "redcarpet", "~> 3.1"
+-    gem "redcarpet", "~> 3.3.2"
++    gem "redcarpet", "~> 3.2"
    end
  end
  
diff --git a/debian/patches/0004-Add-multi-tenancy-support.patch b/debian/patches/0004-Add-multi-tenancy-support.patch
index ea75d16..802ef50 100644
--- a/debian/patches/0004-Add-multi-tenancy-support.patch
+++ b/debian/patches/0004-Add-multi-tenancy-support.patch
@@ -46,7 +46,7 @@ index 173b030..d9e39ef 100644
  /lib/redmine/scm/adapters/mercurial/redminehelper.pyo
  /log/*.log*
 diff --git a/Gemfile b/Gemfile
-index 3e45286..5c14776 100644
+index 24d8257..cd7936b 100644
 --- a/Gemfile
 +++ b/Gemfile
 @@ -52,7 +52,14 @@ end
@@ -66,7 +66,7 @@ index 3e45286..5c14776 100644
    database_config = YAML::load(ERB.new(IO.read(database_file)).result)
    adapters = database_config.values.map {|c| c['adapter']}.compact.uniq
 diff --git a/app/models/attachment.rb b/app/models/attachment.rb
-index 8e3d578..9d8363f 100644
+index d1d7c6d..8037666 100644
 --- a/app/models/attachment.rb
 +++ b/app/models/attachment.rb
 @@ -47,10 +47,10 @@ class Attachment < ActiveRecord::Base

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