[DRE-commits] [redmine] 03/03: New upstream release + patch refresh
Antonio Terceiro
terceiro at moszumanska.debian.org
Fri Aug 11 17:20:33 UTC 2017
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository redmine.
commit 5c703a14a7a48f36851b74733e8fc6c600640099
Author: Antonio Terceiro <terceiro at debian.org>
Date: Fri Aug 11 12:51:58 2017 -0400
New upstream release + patch refresh
---
debian/changelog | 9 ++
.../0001-Gemfile-relax-some-dependencies.patch | 71 ++++++++++------
.../0002-Force-table-encoding-in-mysql.patch | 2 +-
.../patches/0004-Add-multi-tenancy-support.patch | 28 +++----
...how-fields-required-after-status-tracker-.patch | 95 ----------------------
debian/patches/series | 1 -
6 files changed, 72 insertions(+), 134 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2e05be9..e2540dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+redmine (3.4.2-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ * Refresh patches
+ - drop 0006-Bulk-edit-show-fields-required-after-status-tracker-.patch,
+ issue fixed upstream
+
+ -- Antonio Terceiro <terceiro at debian.org> Fri, 11 Aug 2017 12:50:34 -0400
+
redmine (3.3.1-4) unstable; urgency=medium
[ Antonio Terceiro ]
diff --git a/debian/patches/0001-Gemfile-relax-some-dependencies.patch b/debian/patches/0001-Gemfile-relax-some-dependencies.patch
index aa470db..f9d975a 100644
--- a/debian/patches/0001-Gemfile-relax-some-dependencies.patch
+++ b/debian/patches/0001-Gemfile-relax-some-dependencies.patch
@@ -3,31 +3,51 @@ Date: Tue, 25 Aug 2015 18:15:22 -0300
Subject: Gemfile: relax some dependencies
---
- Gemfile | 31 ++++++++-----------------------
- 1 file changed, 8 insertions(+), 23 deletions(-)
+ Gemfile | 50 +++++++++++++++++---------------------------------
+ 1 file changed, 17 insertions(+), 33 deletions(-)
diff --git a/Gemfile b/Gemfile
-index 3a4572e..5b2a620 100644
+index e966d23..5280166 100644
--- a/Gemfile
+++ b/Gemfile
-@@ -4,12 +4,12 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.5.0')
+@@ -4,37 +4,38 @@ 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.7.1"
+-gem "rails", "4.2.8"
++gem "rails", "~> 4.2.8"
+ gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
-gem "jquery-rails", "~> 3.1.4"
-+gem "rails", "~> 4.2.7"
-+gem "jquery-rails", "~> 4.0"
- gem "coderay", "~> 1.1.1"
- gem "builder", ">= 3.0.4"
+-gem "coderay", "~> 1.1.1"
-gem "request_store", "1.0.5"
-gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99")
++gem "jquery-rails", "~> 4.0"
++gem "coderay", "~> 1.1"
++gem "builder", ">= 3.0"
+gem "request_store", "~> 1.1"
+gem "mime-types"
gem "protected_attributes"
- gem "actionpack-action_caching"
gem "actionpack-xml_parser"
-@@ -28,12 +28,12 @@ gem "rbpdf", "~> 1.19.0"
+-gem "roadie-rails", "~> 1.1.1"
+-gem "roadie", "~> 3.2.1"
++gem "roadie-rails", "~> 1.1"
++gem "roadie", "~> 3.2"
+ gem "mimemagic"
+
+-gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.7.2" : "~> 1.6.8")
+-gem "i18n", "~> 0.7.0"
+-gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0"
++gem "nokogiri"
++gem "i18n", "~> 0.7"
++gem "ffi", "1.9", :platforms => :mingw if RUBY_VERSION < "2.0"
+
+ # Request at least rails-html-sanitizer 1.0.3 because of security advisories
+ gem "rails-html-sanitizer", ">= 1.0.3"
+
+ # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+ gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
+-gem "rbpdf", "~> 1.19.2"
++gem "rbpdf", "~> 1.19"
# Optional gem for LDAP authentication
group :ldap do
@@ -42,30 +62,33 @@ index 3a4572e..5b2a620 100644
gem "rack-openid"
end
-@@ -45,7 +45,7 @@ platforms :mri, :mingw, :x64_mingw do
+@@ -46,7 +47,7 @@ platforms :mri, :mingw, :x64_mingw do
# Optional Markdown support, not for JRuby
group :markdown do
-- gem "redcarpet", "~> 3.3.2"
-+ gem "redcarpet", "~> 3.2"
+- gem "redcarpet", "~> 3.4.0"
++ gem "redcarpet", "~> 3.4"
end
end
-@@ -67,7 +67,7 @@ if File.exist?(database_file)
+@@ -62,9 +63,9 @@ if File.exist?(database_file)
adapters.each do |adapter|
case adapter
when 'mysql2'
-- gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw, :x64_mingw]
-+ gem "mysql2", "~> 0.4.0", :platforms => [:mri, :mingw, :x64_mingw]
- gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
- when 'mysql'
- gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
-@@ -92,21 +92,6 @@ else
+- gem "mysql2", "~> 0.4.6", :platforms => [:mri, :mingw, :x64_mingw]
++ gem "mysql2", "~> 0.4", :platforms => [:mri, :mingw, :x64_mingw]
+ when /postgresql/
+- gem "pg", "~> 0.18.1", :platforms => [:mri, :mingw, :x64_mingw]
++ gem "pg", "~> 0.18", :platforms => [:mri, :mingw, :x64_mingw]
+ when /sqlite3/
+ gem "sqlite3", (RUBY_VERSION < "2.0" && RUBY_PLATFORM =~ /mingw/ ? "1.3.12" : "~>1.3.12"),
+ :platforms => [:mri, :mingw, :x64_mingw]
+@@ -82,23 +83,6 @@ else
warn("Please configure your config/database.yml first")
end
-group :development do
-- gem "rdoc", ">= 2.4.2"
+- gem "rdoc", "~> 4.3"
- gem "yard"
-end
-
@@ -74,9 +97,11 @@ index 3a4572e..5b2a620 100644
- gem "rails-dom-testing"
- gem "mocha"
- gem "simplecov", "~> 0.9.1", :require => false
+- # TODO: remove this after upgrading to Rails 5
+- gem "test_after_commit", "~> 0.4.2"
- # For running UI tests
- gem "capybara"
-- gem "selenium-webdriver"
+- gem "selenium-webdriver", "~> 2.53.4"
-end
-
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
diff --git a/debian/patches/0002-Force-table-encoding-in-mysql.patch b/debian/patches/0002-Force-table-encoding-in-mysql.patch
index 42cb07d..9aabb8a 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 ef8b930..9a2ae43 100644
+index 2693f83..c2db5d8 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 d24f6fb..f3bd12a 100644
--- a/debian/patches/0004-Add-multi-tenancy-support.patch
+++ b/debian/patches/0004-Add-multi-tenancy-support.patch
@@ -35,10 +35,10 @@ Signed-off-by: Ondřej Surý <ondrej at sury.org>
create mode 100644 lib/redmine/multi_tenancy.rb
diff --git a/.gitignore b/.gitignore
-index 173b030..d9e39ef 100644
+index e19e36c..d40280a 100644
--- a/.gitignore
+++ b/.gitignore
-@@ -14,6 +14,7 @@
+@@ -15,6 +15,7 @@
/db/*.sqlite3
/db/schema.rb
/files/*
@@ -47,10 +47,10 @@ index 173b030..d9e39ef 100644
/lib/redmine/scm/adapters/mercurial/redminehelper.pyo
/log/*.log*
diff --git a/Gemfile b/Gemfile
-index 5b2a620..cd8a13f 100644
+index 5280166..e4fad92 100644
--- a/Gemfile
+++ b/Gemfile
-@@ -59,12 +59,17 @@ end
+@@ -55,12 +55,17 @@ end
# configuration file
require 'erb'
require 'yaml'
@@ -69,8 +69,8 @@ index 5b2a620..cd8a13f 100644
+ seen_adapters[adapter] = true
case adapter
when 'mysql2'
- gem "mysql2", "~> 0.4.0", :platforms => [:mri, :mingw, :x64_mingw]
-@@ -88,8 +93,6 @@ if File.exist?(database_file)
+ gem "mysql2", "~> 0.4", :platforms => [:mri, :mingw, :x64_mingw]
+@@ -79,8 +84,6 @@ if File.exist?(database_file)
else
warn("No adapter found in config/database.yml, please configure it first")
end
@@ -80,10 +80,10 @@ index 5b2a620..cd8a13f 100644
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
-index 4bc674f..2c340a3 100644
+index eea8013..48a3c98 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
-@@ -47,10 +47,10 @@ class Attachment < ActiveRecord::Base
+@@ -48,10 +48,10 @@ class Attachment < ActiveRecord::Base
"LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id")
cattr_accessor :storage_path
@@ -392,7 +392,7 @@ index 0000000..ab04b47
+
+DOCUMENTATION
diff --git a/config/application.rb b/config/application.rb
-index 96fa38b..acedf1c 100644
+index e1a416a..8c466f3 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -76,6 +76,7 @@ module RedmineApp
@@ -465,7 +465,7 @@ index 48be8dd..1bcbbe4 100644
require 'memcache'
require 'openid/store/memcache'
diff --git a/lib/redmine/configuration.rb b/lib/redmine/configuration.rb
-index 9ab008e..132a911 100644
+index c9a9b6b..a958fc4 100644
--- a/lib/redmine/configuration.rb
+++ b/lib/redmine/configuration.rb
@@ -32,7 +32,7 @@ module Redmine
@@ -487,7 +487,7 @@ index 9ab008e..132a911 100644
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 fd79c37..1bbd44c 100644
+index ff383d1..5f596d9 100644
--- a/lib/redmine/export/pdf.rb
+++ b/lib/redmine/export/pdf.rb
@@ -27,7 +27,7 @@ module Redmine
@@ -549,7 +549,7 @@ index 0000000..0d100f7
+
+end
diff --git a/lib/redmine/plugin.rb b/lib/redmine/plugin.rb
-index 503c3db..adb2a7c 100644
+index c3e8c5b..155126e 100644
--- a/lib/redmine/plugin.rb
+++ b/lib/redmine/plugin.rb
@@ -47,7 +47,7 @@ module Redmine #:nodoc:
@@ -562,10 +562,10 @@ index 503c3db..adb2a7c 100644
@registered_plugins = {}
@used_partials = {}
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
-index 9ed8b25..5b745cd 100644
+index 437ba92..3cb262a 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
-@@ -218,7 +218,7 @@ module Redmine
+@@ -209,7 +209,7 @@ module Redmine
if @stderr_log_file.nil?
writable = false
path = Redmine::Configuration['scm_stderr_log_file'].presence
diff --git a/debian/patches/0006-Bulk-edit-show-fields-required-after-status-tracker-.patch b/debian/patches/0006-Bulk-edit-show-fields-required-after-status-tracker-.patch
deleted file mode 100644
index b196f12..0000000
--- a/debian/patches/0006-Bulk-edit-show-fields-required-after-status-tracker-.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From: Jean-Philippe Lang <jp_lang at yahoo.fr>
-Date: Mon, 13 Feb 2017 14:07:59 -0200
-Subject: Bulk edit: show fields required after status/tracker change
-
-Backported-by: Thomas Klose <thomas.klose at hiperscan.com>
-Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=852694
-Original: http://www.redmine.org/projects/redmine/repository/revisions/15815
-
-This patch must be dropped when upgrading Redmine to version 3.4+.
----
- app/controllers/issues_controller.rb | 25 +++++++++++++++++++++----
- app/views/issues/bulk_edit.html.erb | 6 ++++--
- 2 files changed, 25 insertions(+), 6 deletions(-)
-
-diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
-index c640aad..556425a 100644
---- a/app/controllers/issues_controller.rb
-+++ b/app/controllers/issues_controller.rb
-@@ -217,24 +217,41 @@ class IssuesController < ApplicationController
- end
- end
-
-+ edited_issues = Issue.where(:id => @issues.map(&:id)).to_a
-+
- @allowed_projects = Issue.allowed_target_projects
- if params[:issue]
- @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:issue][:project_id].to_s}
- if @target_project
- target_projects = [@target_project]
-+ edited_issues.each {|issue| issue.project = @target_project}
- end
- end
- target_projects ||= @projects
-
-+ @trackers = target_projects.map {|p| Issue.allowed_target_trackers(p) }.reduce(:&)
-+ if params[:issue]
-+ @target_tracker = @trackers.detect {|t| t.id.to_s == params[:issue][:tracker_id].to_s}
-+ if @target_tracker
-+ edited_issues.each {|issue| issue.tracker = @target_tracker}
-+ end
-+ end
-+
- if @copy
- # Copied issues will get their default statuses
- @available_statuses = []
- else
-- @available_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&)
-+ @available_statuses = edited_issues.map(&:new_statuses_allowed_to).reduce(:&)
- end
-- @custom_fields = @issues.map{|i|i.editable_custom_fields}.reduce(:&)
-+ if params[:issue]
-+ @target_status = @available_statuses.detect {|t| t.id.to_s == params[:issue][:status_id].to_s}
-+ if @target_status
-+ edited_issues.each {|issue| issue.status = @target_status}
-+ end
-+ end
-+
-+ @custom_fields = edited_issues.map{|i|i.editable_custom_fields}.reduce(:&)
- @assignables = target_projects.map(&:assignable_users).reduce(:&)
-- @trackers = target_projects.map {|p| Issue.allowed_target_trackers(p) }.reduce(:&)
- @versions = target_projects.map {|p| p.shared_versions.open}.reduce(:&)
- @categories = target_projects.map {|p| p.issue_categories}.reduce(:&)
- if @copy
-@@ -242,7 +259,7 @@ class IssuesController < ApplicationController
- @subtasks_present = @issues.detect {|i| !i.leaf?}.present?
- end
-
-- @safe_attributes = @issues.map(&:safe_attribute_names).reduce(:&)
-+ @safe_attributes = edited_issues.map(&:safe_attribute_names).reduce(:&)
-
- @issue_params = params[:issue] || {}
- @issue_params[:custom_field_values] ||= {}
-diff --git a/app/views/issues/bulk_edit.html.erb b/app/views/issues/bulk_edit.html.erb
-index 37bdb6d..29b4881 100644
---- a/app/views/issues/bulk_edit.html.erb
-+++ b/app/views/issues/bulk_edit.html.erb
-@@ -43,14 +43,16 @@
- <label for="issue_tracker_id"><%= l(:field_tracker) %></label>
- <%= select_tag('issue[tracker_id]',
- content_tag('option', l(:label_no_change_option), :value => '') +
-- options_from_collection_for_select(@trackers, :id, :name, @issue_params[:tracker_id])) %>
-+ options_from_collection_for_select(@trackers, :id, :name, @issue_params[:tracker_id]),
-+ :onchange => "updateBulkEditFrom('#{escape_javascript url_for(:action => 'bulk_edit', :format => 'js')}')") %>
- </p>
- <% if @available_statuses.any? %>
- <p>
- <label for='issue_status_id'><%= l(:field_status) %></label>
- <%= select_tag('issue[status_id]',
- content_tag('option', l(:label_no_change_option), :value => '') +
-- options_from_collection_for_select(@available_statuses, :id, :name, @issue_params[:status_id])) %>
-+ options_from_collection_for_select(@available_statuses, :id, :name, @issue_params[:status_id]),
-+ :onchange => "updateBulkEditFrom('#{escape_javascript url_for(:action => 'bulk_edit', :format => 'js')}')") %>
- </p>
- <% end %>
-
diff --git a/debian/patches/series b/debian/patches/series
index 11d488b..6361bfb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@
0003-Use-production-environment-by-default.patch
0004-Add-multi-tenancy-support.patch
0005-Assume-default-instance.patch
-0006-Bulk-edit-show-fields-required-after-status-tracker-.patch
--
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