[DRE-commits] [redmine] 03/04: refresh patches on top of 3.2.0
Antonio Terceiro
terceiro at moszumanska.debian.org
Fri Jan 22 13:01:23 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 1b2d3c1b435f31d4cf055d3fdf86de6fb12998d1
Author: Antonio Terceiro <terceiro at debian.org>
Date: Fri Jan 22 10:50:38 2016 -0200
refresh patches on top of 3.2.0
---
.../0001-Gemfile-relax-some-dependencies.patch | 16 ++++------
.../patches/0004-Add-multi-tenancy-support.patch | 37 +++-------------------
2 files changed, 12 insertions(+), 41 deletions(-)
diff --git a/debian/patches/0001-Gemfile-relax-some-dependencies.patch b/debian/patches/0001-Gemfile-relax-some-dependencies.patch
index 235e2e9..7ff03f7 100644
--- a/debian/patches/0001-Gemfile-relax-some-dependencies.patch
+++ b/debian/patches/0001-Gemfile-relax-some-dependencies.patch
@@ -6,17 +6,15 @@ Subject: Gemfile: relax some dependencies
Gemfile | 27 ++++++---------------------
1 file changed, 6 insertions(+), 21 deletions(-)
-diff --git a/Gemfile b/Gemfile
-index ea4136d..24d8257 100644
--- a/Gemfile
+++ b/Gemfile
-@@ -4,11 +4,11 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.5.0')
+@@ -4,11 +4,11 @@ if Gem::Version.new(Bundler::VERSION) <
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.4"
--gem "jquery-rails", "~> 3.1.3"
-+gem "rails", "~> 4.2.4"
+-gem "rails", "4.2.5"
+-gem "jquery-rails", "~> 3.1.4"
++gem "rails", "~> 4.2.5"
+gem "jquery-rails", "~> 4.0"
gem "coderay", "~> 1.1.0"
gem "builder", ">= 3.0.4"
@@ -25,12 +23,12 @@ index ea4136d..24d8257 100644
gem "mime-types"
gem "protected_attributes"
gem "actionpack-action_caching"
-@@ -21,12 +21,12 @@ gem "rbpdf", "~> 1.18.6"
+@@ -21,12 +21,12 @@ gem "rbpdf", "~> 1.19.0"
# Optional gem for LDAP authentication
group :ldap do
-- gem "net-ldap", "~> 0.3.1"
-+ gem "net-ldap", "~> 0.3"
+- gem "net-ldap", "~> 0.12.0"
++ gem "net-ldap", "~> 0.8"
end
# Optional gem for OpenID authentication
diff --git a/debian/patches/0004-Add-multi-tenancy-support.patch b/debian/patches/0004-Add-multi-tenancy-support.patch
index 802ef50..1073c22 100644
--- a/debian/patches/0004-Add-multi-tenancy-support.patch
+++ b/debian/patches/0004-Add-multi-tenancy-support.patch
@@ -33,8 +33,6 @@ 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 @@
@@ -45,8 +43,6 @@ index 173b030..d9e39ef 100644
/lib/redmine/scm/adapters/mercurial/redminehelper.pyc
/lib/redmine/scm/adapters/mercurial/redminehelper.pyo
/log/*.log*
-diff --git a/Gemfile b/Gemfile
-index 24d8257..cd7936b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,14 @@ end
@@ -65,8 +61,6 @@ index 24d8257..cd7936b 100644
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 d1d7c6d..8037666 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -47,10 +47,10 @@ class Attachment < ActiveRecord::Base
@@ -81,10 +75,7 @@ index d1d7c6d..8037666 100644
+ @@thumbnails_storage_path = File.join(Redmine.root, "tmp", "thumbnails")
before_create :files_to_final_location
- after_destroy :delete_from_disk
-diff --git a/bin/redmine-instances b/bin/redmine-instances
-new file mode 100755
-index 0000000..5bf3159
+ after_commit :delete_from_disk, :on => :destroy
--- /dev/null
+++ b/bin/redmine-instances
@@ -0,0 +1,280 @@
@@ -368,21 +359,16 @@ index 0000000..5bf3159
+Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+DOCUMENTATION
-diff --git a/config/application.rb b/config/application.rb
-index 0f75247..b659f30 100644
--- a/config/application.rb
+++ b/config/application.rb
-@@ -65,6 +65,7 @@ module RedmineApp
-
- config.session_store :cookie_store, :key => '_redmine_session'
+@@ -76,6 +76,7 @@ module RedmineApp
+ :key => '_redmine_session',
+ :path => config.relative_url_root || '/'
+ instance_eval File.read(File.join(File.dirname(__FILE__), 'multitenancy_environment.rb'))
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 @@
@@ -428,8 +414,6 @@ index 0000000..f3d9248
+ 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
@@ -441,8 +425,6 @@ index 48be8dd..1bcbbe4 100644
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
@@ -463,8 +445,6 @@ index 9109a00..3d93ff7 100644
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 e3861b6..31ee580 100644
--- a/lib/redmine/export/pdf.rb
+++ b/lib/redmine/export/pdf.rb
@@ -27,7 +27,7 @@ module Redmine
@@ -476,9 +456,6 @@ index e3861b6..31ee580 100644
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 @@
@@ -525,8 +502,6 @@ index 0000000..0d100f7
+ 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
@@ -538,11 +513,9 @@ index 98683b0..f525bb7 100644
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.rb' do
+@@ -15,7 +15,7 @@ file 'config/initializers/secret_token.r
# 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