[DRE-commits] [redmine] 03/15: refresh patches
Antonio Terceiro
terceiro at moszumanska.debian.org
Sun Feb 14 14:32:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository redmine.
commit ad3e5c6a0c23224ad36e6a233423b489f67e82fa
Author: Antonio Terceiro <terceiro at debian.org>
Date: Sat Feb 13 21:20:24 2016 -0200
refresh patches
---
.../0001-Gemfile-relax-some-dependencies.patch | 4 ++-
.../patches/0004-Add-multi-tenancy-support.patch | 29 +++++++++++++++++++++-
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/debian/patches/0001-Gemfile-relax-some-dependencies.patch b/debian/patches/0001-Gemfile-relax-some-dependencies.patch
index 7ff03f7..4a5f7a8 100644
--- a/debian/patches/0001-Gemfile-relax-some-dependencies.patch
+++ b/debian/patches/0001-Gemfile-relax-some-dependencies.patch
@@ -6,9 +6,11 @@ Subject: Gemfile: relax some dependencies
Gemfile | 27 ++++++---------------------
1 file changed, 6 insertions(+), 21 deletions(-)
+diff --git a/Gemfile b/Gemfile
+index 3ad9b1e..5fe15ba 100644
--- a/Gemfile
+++ b/Gemfile
-@@ -4,11 +4,11 @@ if Gem::Version.new(Bundler::VERSION) <
+@@ -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
diff --git a/debian/patches/0004-Add-multi-tenancy-support.patch b/debian/patches/0004-Add-multi-tenancy-support.patch
index 1073c22..36d3913 100644
--- a/debian/patches/0004-Add-multi-tenancy-support.patch
+++ b/debian/patches/0004-Add-multi-tenancy-support.patch
@@ -33,6 +33,8 @@ Signed-off-by: Ondřej Surý <ondrej at sury.org>
create mode 100644 config/multitenancy_environment.rb
create mode 100644 lib/redmine/multi_tenancy.rb
+diff --git a/.gitignore b/.gitignore
+index 173b030..d9e39ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
@@ -43,6 +45,8 @@ Signed-off-by: Ondřej Surý <ondrej at sury.org>
/lib/redmine/scm/adapters/mercurial/redminehelper.pyc
/lib/redmine/scm/adapters/mercurial/redminehelper.pyo
/log/*.log*
+diff --git a/Gemfile b/Gemfile
+index 5fe15ba..4a04b1e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,14 @@ end
@@ -61,6 +65,8 @@ Signed-off-by: Ondřej Surý <ondrej at sury.org>
if File.exist?(database_file)
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 0064555..c75fd25 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -47,10 +47,10 @@ class Attachment < ActiveRecord::Base
@@ -76,6 +82,9 @@ Signed-off-by: Ondřej Surý <ondrej at sury.org>
before_create :files_to_final_location
after_commit :delete_from_disk, :on => :destroy
+diff --git a/bin/redmine-instances b/bin/redmine-instances
+new file mode 100755
+index 0000000..5bf3159
--- /dev/null
+++ b/bin/redmine-instances
@@ -0,0 +1,280 @@
@@ -359,6 +368,8 @@ Signed-off-by: Ondřej Surý <ondrej at sury.org>
+Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+DOCUMENTATION
+diff --git a/config/application.rb b/config/application.rb
+index 96fa38b..acedf1c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -76,6 +76,7 @@ module RedmineApp
@@ -369,6 +380,9 @@ Signed-off-by: Ondřej Surý <ondrej at sury.org>
if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
end
+diff --git a/config/multitenancy_environment.rb b/config/multitenancy_environment.rb
+new file mode 100644
+index 0000000..f3d9248
--- /dev/null
+++ b/config/multitenancy_environment.rb
@@ -0,0 +1,42 @@
@@ -414,6 +428,8 @@ Signed-off-by: Ondřej Surý <ondrej at sury.org>
+ end
+
+end
+diff --git a/lib/plugins/open_id_authentication/lib/open_id_authentication.rb b/lib/plugins/open_id_authentication/lib/open_id_authentication.rb
+index 48be8dd..1bcbbe4 100644
--- a/lib/plugins/open_id_authentication/lib/open_id_authentication.rb
+++ b/lib/plugins/open_id_authentication/lib/open_id_authentication.rb
@@ -25,7 +25,7 @@ module OpenIdAuthentication
@@ -425,6 +441,8 @@ Signed-off-by: Ondřej Surý <ondrej at sury.org>
when :memcache
require 'memcache'
require 'openid/store/memcache'
+diff --git a/lib/redmine/configuration.rb b/lib/redmine/configuration.rb
+index 9109a00..3d93ff7 100644
--- a/lib/redmine/configuration.rb
+++ b/lib/redmine/configuration.rb
@@ -32,7 +32,7 @@ module Redmine
@@ -445,6 +463,8 @@ Signed-off-by: Ondřej Surý <ondrej at sury.org>
if File.file?(deprecated_email_conf)
warn "Storing outgoing emails configuration in config/email.yml is deprecated. You should now store it in config/configuration.yml using the email_delivery setting."
@config.merge!({'email_delivery' => load_from_yaml(deprecated_email_conf, env)})
+diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb
+index d14bbd8..309b83a 100644
--- a/lib/redmine/export/pdf.rb
+++ b/lib/redmine/export/pdf.rb
@@ -27,7 +27,7 @@ module Redmine
@@ -456,6 +476,9 @@ Signed-off-by: Ondřej Surý <ondrej at sury.org>
FileUtils.mkdir_p @@k_path_cache unless File::exist?(@@k_path_cache)
set_language_if_valid lang
super(orientation, 'mm', 'A4')
+diff --git a/lib/redmine/multi_tenancy.rb b/lib/redmine/multi_tenancy.rb
+new file mode 100644
+index 0000000..0d100f7
--- /dev/null
+++ b/lib/redmine/multi_tenancy.rb
@@ -0,0 +1,43 @@
@@ -502,6 +525,8 @@ Signed-off-by: Ondřej Surý <ondrej at sury.org>
+ end
+
+end
+diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
+index 98683b0..f525bb7 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -218,7 +218,7 @@ module Redmine
@@ -513,9 +538,11 @@ Signed-off-by: Ondřej Surý <ondrej at sury.org>
if File.exists?(path)
if File.file?(path) && File.writable?(path)
writable = true
+diff --git a/lib/tasks/initializers.rake b/lib/tasks/initializers.rake
+index 6da60c1..eb96177 100644
--- a/lib/tasks/initializers.rake
+++ b/lib/tasks/initializers.rake
-@@ -15,7 +15,7 @@ file 'config/initializers/secret_token.r
+@@ -15,7 +15,7 @@ file 'config/initializers/secret_token.rb' do
# change this key, all old sessions will become invalid! Make sure the
# secret is at least 30 characters and all random, no regular words or
# you'll be exposed to dictionary attacks.
--
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