[DRE-commits] [redmine] 01/05: refresh patches
Antonio Terceiro
terceiro at moszumanska.debian.org
Fri Jan 22 13:01:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch patch-queue/master
in repository redmine.
commit 300b56ac443d5bf28cec856092c7f710bee49534
Author: Antonio Terceiro <terceiro at debian.org>
Date: Mon Oct 5 17:35:02 2015 -0300
refresh patches
---
debian/patches/0001-Gemfile-relax-some-dependencies.patch | 8 ++++----
debian/patches/0004-Add-multi-tenancy-support.patch | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/debian/patches/0001-Gemfile-relax-some-dependencies.patch b/debian/patches/0001-Gemfile-relax-some-dependencies.patch
index ce6b4a4..2416a9e 100644
--- a/debian/patches/0001-Gemfile-relax-some-dependencies.patch
+++ b/debian/patches/0001-Gemfile-relax-some-dependencies.patch
@@ -7,13 +7,13 @@ Subject: Gemfile: relax some dependencies
1 file changed, 5 insertions(+), 20 deletions(-)
diff --git a/Gemfile b/Gemfile
-index db1abbb..3e45286 100644
+index ea4136d..47e763c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,10 +5,10 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.5.0')
end
- gem "rails", "4.2.3"
+ gem "rails", "4.2.4"
-gem "jquery-rails", "~> 3.1.3"
+gem "jquery-rails", "~> 4.0"
gem "coderay", "~> 1.1.0"
@@ -42,8 +42,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..c5e421f 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 47e763c..63a8647 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
More information about the Pkg-ruby-extras-commits
mailing list