[DRE-commits] [redmine] 06/11: Drop all patches, let's start from scratch

Antonio Terceiro terceiro at moszumanska.debian.org
Tue Aug 25 23:47:26 UTC 2015


This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository redmine.

commit d6f591000bc2558d91c1e86aab9247a73040d807
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Aug 25 17:44:30 2015 -0300

    Drop all patches, let's start from scratch
---
 debian/changelog                                   |   1 +
 .../patches/0001-Escape-flash-messages-19117.patch |  45 --------
 debian/patches/1001_Parsedate.parsedate.patch      |  16 ---
 debian/patches/2002_FHS_through_env_vars.patch     | 116 ---------------------
 .../patches/2003_externalize_session_config.patch  |  74 -------------
 debian/patches/2004_FHS_plugins_assets.patch       |  11 --
 .../patches/2008_force_table_encoding_mysql.patch  |  31 ------
 debian/patches/2009_FHS_thin_config.patch          |  15 ---
 debian/patches/2018_get_rid_of_rdoctask.patch      |  40 -------
 debian/patches/2020_load_awesome_nested_set.patch  |   9 --
 debian/patches/avoid-crash-on-issues.diff          |  48 ---------
 debian/patches/changeset_r11680.diff               |  14 ---
 debian/patches/drop-update_all.patch               |  68 ------------
 .../patches/fix-move-issue-between-projects.patch  |  47 ---------
 debian/patches/gemfile-adjustments.patch           |  75 -------------
 ...alidate-language-cache-from-older-versions.diff |  20 ----
 debian/patches/series                              |  14 ---
 17 files changed, 1 insertion(+), 643 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 085bd15..7927b30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ redmine (3.1.0-1) UNRELEASED; urgency=medium
   * Bump debhelper compatibility level to 9
   * Move from cdbs to dh
   * Stop builing fonts, upstream redmine doesn't rely on them anymore
+  * Drop all patches, let's start from scratch
 
  -- Antonio Terceiro <terceiro at debian.org>  Tue, 25 Aug 2015 17:33:17 -0300
 
diff --git a/debian/patches/0001-Escape-flash-messages-19117.patch b/debian/patches/0001-Escape-flash-messages-19117.patch
deleted file mode 100644
index 442079b..0000000
--- a/debian/patches/0001-Escape-flash-messages-19117.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2a7795ab525a47aee4484708acde409e6c4e6737 Mon Sep 17 00:00:00 2001
-From: Jean-Philippe Lang <jp_lang at yahoo.fr>
-Date: Tue, 17 Feb 2015 17:47:36 +0000
-Subject: [PATCH] Escape flash messages (#19117).
-
-git-svn-id: http://svn.redmine.org/redmine/trunk@14016 e93f8b46-1217-0410-a6f0-8f06a7374b81
----
- app/controllers/account_controller.rb | 2 +-
- app/controllers/admin_controller.rb   | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
---- a/app/controllers/account_controller.rb
-+++ b/app/controllers/account_controller.rb
-@@ -290,7 +290,7 @@ class AccountController < ApplicationCon
-     token = Token.new(:user => user, :action => "register")
-     if user.save and token.save
-       Mailer.register(token).deliver
--      flash[:notice] = l(:notice_account_register_done, :email => user.mail)
-+      flash[:notice] = l(:notice_account_register_done, :email => ERB::Util.h(user.mail))
-       redirect_to signin_path
-     else
-       yield if block_given?
---- a/app/controllers/admin_controller.rb
-+++ b/app/controllers/admin_controller.rb
-@@ -51,7 +51,7 @@ class AdminController < ApplicationContr
-         Redmine::DefaultData::Loader::load(params[:lang])
-         flash[:notice] = l(:notice_default_data_loaded)
-       rescue Exception => e
--        flash[:error] = l(:error_can_t_load_default_data, e.message)
-+        flash[:error] = l(:error_can_t_load_default_data, ERB::Util.h(e.message))
-       end
-     end
-     redirect_to admin_path
-@@ -63,9 +63,9 @@ class AdminController < ApplicationContr
-     ActionMailer::Base.raise_delivery_errors = true
-     begin
-       @test = Mailer.test_email(User.current).deliver
--      flash[:notice] = l(:notice_email_sent, User.current.mail)
-+      flash[:notice] = l(:notice_email_sent, ERB::Util.h(User.current.mail))
-     rescue Exception => e
--      flash[:error] = l(:notice_email_error, Redmine::CodesetUtil.replace_invalid_utf8(e.message.dup))
-+      flash[:error] = l(:notice_email_error, ERB::Util.h(Redmine::CodesetUtil.replace_invalid_utf8(e.message.dup)))
-     end
-     ActionMailer::Base.raise_delivery_errors = raise_delivery_errors
-     redirect_to settings_path(:tab => 'notifications')
diff --git a/debian/patches/1001_Parsedate.parsedate.patch b/debian/patches/1001_Parsedate.parsedate.patch
deleted file mode 100644
index 8ad6832..0000000
--- a/debian/patches/1001_Parsedate.parsedate.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Replace missing ParseDate with DateTime (Closes: #700754)
-Origin: upstream, http://www.redmine.org/projects/redmine/repository/revisions/10439
-Origin: upstream, http://www.redmine.org/projects/redmine/repository/revisions/11091
-Last-Update: 2013-02-26
---- redmine.orig/lib/SVG/Graph/Schedule.rb
-+++ redmine/lib/SVG/Graph/Schedule.rb
-@@ -159,8 +159,7 @@ module SVG
-           if im3 == 0
-             y << data[:data][i]
-           else
--            arr = ParseDate.parsedate( data[:data][i] )
--            t = Time.local( *arr[0,6].compact )
-+            t = DateTime.parse( data[:data][i] ).to_time
-             (im3 == 1 ? x_start : x_end) << t.to_i
-           end
-         }
diff --git a/debian/patches/2002_FHS_through_env_vars.patch b/debian/patches/2002_FHS_through_env_vars.patch
deleted file mode 100644
index 231e283..0000000
--- a/debian/patches/2002_FHS_through_env_vars.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Description: FHS through env vars
-Forwarded: not-needed
-Author: Jérémy Lal <kapouer at melix.org>
-Last-Update: 2013-09-28
---- a/app/models/attachment.rb
-+++ b/app/models/attachment.rb
-@@ -47,10 +47,10 @@ class Attachment < ActiveRecord::Base
-                                             "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id")
- 
-   cattr_accessor :storage_path
--  @@storage_path = Redmine::Configuration['attachments_storage_path'] || File.join(Rails.root, "files")
-+  @@storage_path = Redmine::Configuration['attachments_storage_path'] || ENV['RAILS_VAR'] ? File.join(ENV['RAILS_VAR'], "files") : File.join(Rails.root, "files")
- 
-   cattr_accessor :thumbnails_storage_path
--  @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails")
-+  @@thumbnails_storage_path = ENV['RAILS_TMP'] ? File.join(ENV['RAILS_TMP'], "thumbnails") : File.join(Rails.root, "tmp", "thumbnails")
- 
-   before_save :files_to_final_location
-   after_destroy :delete_from_disk
---- a/lib/redmine/configuration.rb
-+++ b/lib/redmine/configuration.rb
-@@ -32,7 +32,7 @@ module Redmine
-       # * <tt>:file</tt>: the configuration file to load (default: config/configuration.yml)
-       # * <tt>:env</tt>: the environment to load the configuration for (default: Rails.env)
-       def load(options={})
--        filename = options[:file] || File.join(Rails.root, 'config', 'configuration.yml')
-+        filename = options[:file] || ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'configuration.yml') : File.join(Rails.root, 'config', 'configuration.yml')
-         env = options[:env] || Rails.env
- 
-         @config = @defaults.dup
-@@ -106,7 +106,7 @@ module Redmine
-       end
- 
-       def load_deprecated_email_configuration(env)
--        deprecated_email_conf = File.join(Rails.root, 'config', 'email.yml')
-+        deprecated_email_conf = ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'email.yml') : File.join(Rails.root, 'config', 'email.yml')
-         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)})
---- a/lib/redmine/export/pdf.rb
-+++ b/lib/redmine/export/pdf.rb
-@@ -34,7 +34,7 @@ module Redmine
-         attr_accessor :footer_date
- 
-         def initialize(lang, orientation='P')
--          @@k_path_cache = Rails.root.join('tmp', 'pdf')
-+          @@k_path_cache = ENV['RAILS_TMP'] ? File.join(ENV['RAILS_TMP'], 'pdf') : Rails.root.join('tmp', 'pdf')
-           FileUtils.mkdir_p @@k_path_cache unless File::exist?(@@k_path_cache)
-           set_language_if_valid lang
-           pdf_encoding = l(:general_pdf_encoding).upcase
---- a/config/application.rb
-+++ b/config/application.rb
-@@ -2,6 +2,17 @@ require File.expand_path('../boot', __FI
- 
- require 'rails/all'
- 
-+# Force Rails environment to be production
-+Rails.env ||= ActiveSupport::StringInquirer.new('production')
-+
-+# for debian package : setup proper environment variables and paths
-+# To run redmine as unprivileged user, see /usr/share/doc/redmine/README.Debian
-+ENV['X_DEBIAN_SITEID'] ||= 'default'
-+ENV['RAILS_ETC'] = "/etc/redmine/#{ENV['X_DEBIAN_SITEID']}"
-+ENV['RAILS_LOG'] = "/var/log/redmine/#{ENV['X_DEBIAN_SITEID']}"
-+ENV['RAILS_VAR'] = "/var/lib/redmine/#{ENV['X_DEBIAN_SITEID']}"
-+ENV['RAILS_TMP'] = "/var/cache/redmine/#{ENV['X_DEBIAN_SITEID']}"
-+
- Bundler.require(*Rails.groups)
- 
- module RedmineApp
-@@ -47,8 +58,19 @@ module RedmineApp
-     # Do not include all helpers
-     config.action_controller.include_all_helpers = false
- 
-+    # move tmp directory to RAILS_TMP
-+    config.paths['tmp'] = ENV['RAILS_TMP']
-+
-     config.session_store :cookie_store, :key => '_redmine_session'
- 
-+    # log path
-+    config.paths['log'] = File.join(ENV['RAILS_LOG'], "#{Rails.env}.log") unless !ENV['RAILS_LOG']
-+
-+    config.cache_store = :file_store, File.join(ENV['RAILS_TMP'], "cache")
-+
-+    # Set Active Record's database.yml path
-+    config.paths['config/database'] = File.join(ENV['RAILS_ETC'], 'database.yml') unless !ENV['RAILS_ETC']
-+
-     if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
-       instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
-     end
---- a/lib/plugins/rfpdf/lib/tcpdf.rb
-+++ b/lib/plugins/rfpdf/lib/tcpdf.rb
-@@ -89,10 +89,10 @@ class TCPDF
-   @@k_small_ratio = 2/3.0
-   
-   cattr_accessor :k_path_cache
--  @@k_path_cache = Rails.root.join('tmp')
-+  @@k_path_cache = ENV['RAILS_TMP'] ? ENV['RAILS_TMP'] : Rails.root.join('tmp')
-   
-   cattr_accessor :k_path_url_cache
--  @@k_path_url_cache = Rails.root.join('tmp')
-+  @@k_path_url_cache = ENV['RAILS_TMP'] ? ENV['RAILS_TMP'] : Rails.root.join('tmp')
-   
- 	attr_accessor :barcode
- 	
---- a/lib/redmine/scm/adapters/abstract_adapter.rb
-+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
-@@ -218,7 +218,7 @@ module Redmine
-           if @stderr_log_file.nil?
-             writable = false
-             path = Redmine::Configuration['scm_stderr_log_file'].presence
--            path ||= Rails.root.join("log/#{Rails.env}.scm.stderr.log").to_s
-+            path ||= ENV['RAILS_LOG'] ? File.join(ENV['RAILS_LOG'], "#{Rails.env}.scm.stderr.log").to_s : Rails.root.join("log/#{Rails.env}.scm.stderr.log").to_s
-             if File.exists?(path)
-               if File.file?(path) && File.writable?(path) 
-                 writable = true
diff --git a/debian/patches/2003_externalize_session_config.patch b/debian/patches/2003_externalize_session_config.patch
deleted file mode 100644
index 9412ed5..0000000
--- a/debian/patches/2003_externalize_session_config.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Description: Externalize session config to yml in /etc
-Forwarded: not-needed
-Author: Jérémy Lal <kapouer at melix.org>
-Last-Update: 2010-01-10
---- a/lib/tasks/initializers.rake
-+++ b/lib/tasks/initializers.rake
-@@ -1,11 +1,14 @@
- desc 'Generates a secret token for the application.'
-+task :generate_secret_token do
- 
--file 'config/initializers/secret_token.rb' do
--  path = File.join(Rails.root, 'config', 'initializers', 'secret_token.rb')
--  secret = SecureRandom.hex(40)
--  File.open(path, 'w') do |f|
--    f.write <<"EOF"
--# This file was generated by 'rake generate_secret_token', and should
-+ENV['X_DEBIAN_SITEID'] ||= 'default'
-+ENV['RAILS_ETC'] = "/etc/redmine/#{ENV['X_DEBIAN_SITEID']}"
-+filename = ENV['YML_SESSION_FILENAME'] ? ENV['YML_SESSION_FILENAME'] : 'session.yml'
-+path = File.join(ENV['RAILS_ETC'] ? ENV['RAILS_ETC'] : File.join(Rails.root, 'config'), filename)
-+secret = SecureRandom.hex(40)
-+File.open(path, 'w') do |f|
-+  f.write <<"EOF"
-+# This file was generated by 'rake generate_session_store',
- # not be made visible to public.
- # If you have a load-balancing Redmine cluster, you will need to use the
- # same version of this file on each machine. And be sure to restart your
-@@ -15,10 +18,18 @@ 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.
--RedmineApp::Application.config.secret_token = '#{secret}'
-+
-+production:
-+  key: _redmine_#{ENV['X_DEBIAN_SITEID']}
-+  secret: #{secret}
-+
-+development:
-+  key: _redmine_#{ENV['X_DEBIAN_SITEID']}
-+  secret: #{secret}
-+
-+test:
-+  key: _redmine_#{ENV['X_DEBIAN_SITEID']}
-+  secret: #{secret}
- EOF
-   end
- end
--
--desc 'Generates a secret token for the application.'
--task :generate_secret_token => ['config/initializers/secret_token.rb']
---- a/config/application.rb
-+++ b/config/application.rb
-@@ -61,7 +61,20 @@ module RedmineApp
-     # move tmp directory to RAILS_TMP
-     config.paths['tmp'] = ENV['RAILS_TMP']
- 
--    config.session_store :cookie_store, :key => '_redmine_session'
-+    # loads cookie based session session and secret keys
-+    # this is needed here because initializers are loaded after plugins,
-+    # and some plugins initialize ActionController which requires a secret to be set.
-+    # crash if file not found
-+    relativeUrlRoot = ENV['RAILS_RELATIVE_URL_ROOT']
-+    filename = ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'session.yml') : File.join(File.dirname(__FILE__), '..', 'session.yml')
-+    if File.exists?(filename)
-+      sessionconfig = YAML::load_file(filename)
-+      config.session_store :cookie_store, :key => sessionconfig[Rails.env]['key'], :path => (relativeUrlRoot.blank?) ? '/' : relativeUrlRoot
-+      config.secret_token = sessionconfig[Rails.env]['secret']
-+    else
-+      # temporary settings before session.yml is created
-+      config.session_store :cookie_store, :key => '_redmine_session', :path => (relativeUrlRoot.blank?) ? '/' : relativeUrlRoot
-+    end
- 
-     # log path
-     config.paths['log'] = File.join(ENV['RAILS_LOG'], "#{Rails.env}.log") unless !ENV['RAILS_LOG']
diff --git a/debian/patches/2004_FHS_plugins_assets.patch b/debian/patches/2004_FHS_plugins_assets.patch
deleted file mode 100644
index d9a6844..0000000
--- a/debian/patches/2004_FHS_plugins_assets.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- redmine.orig/lib/redmine/plugin.rb
-+++ redmine/lib/redmine/plugin.rb
-@@ -47,7 +47,7 @@ module Redmine #:nodoc:
-     self.directory = File.join(Rails.root, 'plugins')
- 
-     cattr_accessor :public_directory
--    self.public_directory = File.join(Rails.root, 'public', 'plugin_assets')
-+    self.public_directory = ENV['RAILS_TMP'] ? File.join(ENV['RAILS_TMP'], 'plugin_assets') : File.join(Rails.root, 'public', 'plugin_assets')
- 
-     @registered_plugins = {}
-     class << self
diff --git a/debian/patches/2008_force_table_encoding_mysql.patch b/debian/patches/2008_force_table_encoding_mysql.patch
deleted file mode 100644
index 74265d3..0000000
--- a/debian/patches/2008_force_table_encoding_mysql.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Force table encoding in mysql
- mysql default encoding is not UTF8, but forcing table encoding is possible.
- dbconfig-common does not provide appropriate configuration variable,
- so here the mysql adapter is modified to respect encoding set in database.yml
-Forwarded: not-needed
-Author: Jérémy Lal <kapouer at melix.org>
-Bug-Debian: http://bugs.debian.org/599374
-Bug-Rails: http://rails.lighthouseapp.com/projects/8994/tickets/5830
-Last-Update: 2010-10-17
---- redmine.orig/config/initializers/10-patches.rb
-+++ redmine/config/initializers/10-patches.rb
-@@ -1,4 +1,19 @@
- require 'active_record'
-+require 'active_record/connection_adapters/abstract_mysql_adapter'
-+
-+module ActiveRecord
-+  module ConnectionAdapters
-+    class MysqlAdapter < AbstractMysqlAdapter
-+      def create_table(table_name, options = {}) #:nodoc:
-+        encoding = @config[:encoding]
-+        if encoding
-+          options = options.reverse_merge(:options => "DEFAULT CHARSET=#{encoding}")
-+        end
-+        super(table_name, options.reverse_merge(:options => "ENGINE=InnoDB"))
-+      end
-+    end
-+  end
-+end
- 
- module ActiveRecord
-   class Base
diff --git a/debian/patches/2009_FHS_thin_config.patch b/debian/patches/2009_FHS_thin_config.patch
deleted file mode 100644
index 7f44a42..0000000
--- a/debian/patches/2009_FHS_thin_config.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: FHS support for thin config
- See debian/doc/examples/thin-redmine.yml
-Forwarded: not-needed
-Author: Jérémy Lal <kapouer at melix.org>
-Last-Update: 2010-11-01
---- a/config/application.rb
-+++ b/config/application.rb
-@@ -7,6 +7,7 @@ Rails.env ||= ActiveSupport::StringInqui
- 
- # for debian package : setup proper environment variables and paths
- # To run redmine as unprivileged user, see /usr/share/doc/redmine/README.Debian
-+ObjectSpace.each_object(Thin::Runner){|x| ENV["X_DEBIAN_SITEID"] = x.options[:x_debian_siteid] if x.options[:x_debian_siteid]} if defined?(Thin)
- ENV['X_DEBIAN_SITEID'] ||= 'default'
- ENV['RAILS_ETC'] = "/etc/redmine/#{ENV['X_DEBIAN_SITEID']}"
- ENV['RAILS_LOG'] = "/var/log/redmine/#{ENV['X_DEBIAN_SITEID']}"
diff --git a/debian/patches/2018_get_rid_of_rdoctask.patch b/debian/patches/2018_get_rid_of_rdoctask.patch
deleted file mode 100644
index 31072f0..0000000
--- a/debian/patches/2018_get_rid_of_rdoctask.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- redmine.orig/lib/plugins/acts_as_tree/Rakefile
-+++ redmine/lib/plugins/acts_as_tree/Rakefile
-@@ -1,6 +1,6 @@
- require 'rake'
- require 'rake/testtask'
--require 'rake/rdoctask'
-+require 'rdoc/task'
- 
- desc 'Default: run unit tests.'
- task :default => :test
---- redmine.orig/lib/plugins/acts_as_versioned/Rakefile
-+++ redmine/lib/plugins/acts_as_versioned/Rakefile
-@@ -2,7 +2,7 @@ require 'rubygems'
- 
- Gem::manage_gems
- 
--require 'rake/rdoctask'
-+require 'rdoc/task'
- require 'rake/packagetask'
- require 'rake/gempackagetask'
- require 'rake/testtask'
---- redmine.orig/lib/plugins/gravatar/Rakefile
-+++ redmine/lib/plugins/gravatar/Rakefile
-@@ -1,5 +1,5 @@
- require 'spec/rake/spectask'
--require 'rake/rdoctask'
-+require 'rdoc/task'
- 
- desc 'Default: run all specs'
- task :default => :spec
---- redmine.orig/lib/plugins/open_id_authentication/Rakefile
-+++ redmine/lib/plugins/open_id_authentication/Rakefile
-@@ -1,6 +1,6 @@
- require 'rake'
- require 'rake/testtask'
--require 'rake/rdoctask'
-+require 'rdoc/task'
- 
- desc 'Default: run unit tests.'
- task :default => :test
diff --git a/debian/patches/2020_load_awesome_nested_set.patch b/debian/patches/2020_load_awesome_nested_set.patch
deleted file mode 100644
index 62e3e82..0000000
--- a/debian/patches/2020_load_awesome_nested_set.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- redmine.orig/config/initializers/10-patches.rb
-+++ redmine/config/initializers/10-patches.rb
-@@ -1,5 +1,6 @@
- require 'active_record'
- require 'active_record/connection_adapters/abstract_mysql_adapter'
-+require 'awesome_nested_set'
- 
- module ActiveRecord
-   module ConnectionAdapters
diff --git a/debian/patches/avoid-crash-on-issues.diff b/debian/patches/avoid-crash-on-issues.diff
deleted file mode 100644
index 1d50bc6..0000000
--- a/debian/patches/avoid-crash-on-issues.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: fix crashes in some issue management configurations
-Author: Jean-Philippe Lang <jp_lang at yahoo.fr>
-Origin: upstream
-Bug: http://www.redmine.org/issues/18275
-Bug-Debian: https://bugs.debian.org/771849
-Reviewed-by: Antonio Terceiro <terceiro at debian.org>
-Last-Update: 2014-11-04
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/test/functional/repositories_controller_test.rb
-+++ b/test/functional/repositories_controller_test.rb
-@@ -166,6 +166,18 @@ class RepositoriesControllerTest < Actio
-     assert_equal "1", assigns(:changeset).revision
-   end
- 
-+  def test_revision_should_show_add_related_issue_form
-+    Role.find(1).add_permission! :manage_related_issues
-+    @request.session[:user_id] = 2
-+
-+    get :revision, :id => 1, :rev => 1
-+    assert_response :success
-+
-+    assert_select 'form[action=?]', '/projects/ecookbook/repository/revisions/1/issues' do
-+      assert_select 'input[name=?]', 'issue_id'
-+    end
-+  end
-+
-   def test_revision_should_not_change_the_project_menu_link
-     get :revision, :id => 1, :rev => 1
-     assert_response :success
---- a/app/views/repositories/_related_issues.html.erb
-+++ b/app/views/repositories/_related_issues.html.erb
-@@ -24,12 +24,12 @@
- </ul>
- 
- <% if manage_allowed %>
--  <%= form_for(@issue, :as => :issue, :remote => true,
--       :url => {:controller => 'repositories', :action => 'add_related_issue',
-+  <%= form_tag({:controller => 'repositories', :action => 'add_related_issue',
-                 :id => @project, :repository_id => @repository.identifier_param,
-                 :rev => @changeset.identifier},
-+       :remote => true,
-        :method => :post,
--       :html => {:id => 'new-relation-form', :style => (@issue ? '' : 'display: none;')}) do |f| %>
-+       :id => 'new-relation-form', :style => (@issue ? '' : 'display: none;')) do |f| %>
-   <%= l(:label_issue) %> #<%= text_field_tag 'issue_id', '', :size => 10 %>
-   <%= submit_tag l(:button_add) %>
-   <%= toggle_link l(:button_cancel), 'new-relation-form'%>
diff --git a/debian/patches/changeset_r11680.diff b/debian/patches/changeset_r11680.diff
deleted file mode 100644
index b03833d..0000000
--- a/debian/patches/changeset_r11680.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/lib/redmine/scm/adapters/abstract_adapter.rb
-+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
-@@ -228,9 +228,9 @@ module Redmine
-         def self.shellout(cmd, options = {}, &block)
-           if logger && logger.debug?
-             logger.debug "Shelling out: #{strip_credential(cmd)}"
-+            # Capture stderr in a log file
-+            cmd = "#{cmd} 2>>#{shell_quote(stderr_log_file)}"
-           end
--          # Capture stderr in a log file
--          cmd = "#{cmd} 2>>#{shell_quote(stderr_log_file)}"
-           begin
-             mode = "r+"
-             IO.popen(cmd, mode) do |io|
diff --git a/debian/patches/drop-update_all.patch b/debian/patches/drop-update_all.patch
deleted file mode 100644
index 5db53bb..0000000
--- a/debian/patches/drop-update_all.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Description: replace usage of deprecated #update_all method in migrations
-Author: Toshi MARUYAMA <marutosijp2 at yahoo.co.jp>
-Origin: upstream
-Bug: http://www.redmine.org/issues/18132
-Bug-Debian: https://bugs.debian.org/765466
-Reviewed-by: Antonio Terceiro <terceiro at debian.org>
-Last-Update: 2014-11-30
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/db/migrate/072_add_enumerations_position.rb
-+++ b/db/migrate/072_add_enumerations_position.rb
-@@ -4,7 +4,7 @@ class AddEnumerationsPosition < ActiveRe
-     Enumeration.all.group_by(&:opt).each do |opt, enums|
-       enums.each_with_index do |enum, i|
-         # do not call model callbacks
--        Enumeration.update_all "position = #{i+1}", {:id => enum.id}
-+        Enumeration.where({:id => enum.id}).update_all("position = #{i+1}")
-       end
-     end
-   end
---- a/db/migrate/078_add_custom_fields_position.rb
-+++ b/db/migrate/078_add_custom_fields_position.rb
-@@ -4,7 +4,7 @@ class AddCustomFieldsPosition < ActiveRe
-     CustomField.all.group_by(&:type).each  do |t, fields|
-       fields.each_with_index do |field, i|
-         # do not call model callbacks
--        CustomField.update_all "position = #{i+1}", {:id => field.id}
-+        CustomField.where({:id => field.id}).update_all("position = #{i+1}")
-       end
-     end
-   end
---- a/db/migrate/101_populate_changesets_user_id.rb
-+++ b/db/migrate/101_populate_changesets_user_id.rb
-@@ -7,7 +7,7 @@ class PopulateChangesetsUserId < ActiveR
-         username, email = $1.strip, $3
-         u = User.find_by_login(username)
-         u ||= User.find_by_mail(email) unless email.blank?
--        Changeset.update_all("user_id = #{u.id}", ["committer = ?", committer]) unless u.nil?
-+        Changeset.where(["committer = ?", committer]).update_all("user_id = #{u.id}") unless u.nil?
-       end
-     end
-   end
---- a/db/migrate/20091225164732_remove_enumerations_opt.rb
-+++ b/db/migrate/20091225164732_remove_enumerations_opt.rb
-@@ -5,8 +5,8 @@ class RemoveEnumerationsOpt < ActiveReco
- 
-   def self.down
-     add_column :enumerations, :opt, :string, :limit => 4, :default => '', :null => false
--    Enumeration.update_all("opt = 'IPRI'", "type = 'IssuePriority'")
--    Enumeration.update_all("opt = 'DCAT'", "type = 'DocumentCategory'")
--    Enumeration.update_all("opt = 'ACTI'", "type = 'TimeEntryActivity'")
-+    Enumeration.where("type = 'IssuePriority'").update_all("opt = 'IPRI'")
-+    Enumeration.where("type = 'DocumentCategory'").update_all("opt = 'DCAT'")
-+    Enumeration.where("type = 'TimeEntryActivity'").update_all("opt = 'ACTI'")
-   end
- end
---- a/db/migrate/20130215111141_populate_issues_closed_on.rb
-+++ b/db/migrate/20130215111141_populate_issues_closed_on.rb
-@@ -15,7 +15,8 @@ class PopulateIssuesClosedOn < ActiveRec
- 
-       # Then set closed_on for closed issues that weren't up updated by the above UPDATE
-       # No journal was found so we assume that they were closed on creation
--      Issue.update_all "closed_on = created_on", {:status_id => closed_status_ids, :closed_on => nil}
-+      Issue.where({:status_id => closed_status_ids, :closed_on => nil}).
-+               update_all("closed_on = created_on")
-     end
-   end
- 
diff --git a/debian/patches/fix-move-issue-between-projects.patch b/debian/patches/fix-move-issue-between-projects.patch
deleted file mode 100644
index 234aace..0000000
--- a/debian/patches/fix-move-issue-between-projects.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Description: Fix moving issues between projects
- For some reason this bug does not affect upstream. Probably the 3.0~20140825
- snapshot was taken at a time when this was broken but the brokennes never made
- it into a release.
-Author: Tristam Fenton-May <tfm-debian at earth.li>
-Origin: vendor
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=783717
-Forwarded: not-needed
-Reviewed-by: Antonio Terceiro <terceiro at debian.org>
-Last-Update: 2015-05-02
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/app/controllers/issues_controller.rb
-+++ b/app/controllers/issues_controller.rb
-@@ -21,7 +21,8 @@ class IssuesController < ApplicationCont
- 
-   before_filter :find_issue, :only => [:show, :edit, :update]
-   before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy]
--  before_filter :find_project, :only => [:new, :create, :update_form]
-+  before_filter :find_project, :only => [:new, :create]
-+  before_filter :find_project_from_issue, :only => [:update_form]
-   before_filter :authorize, :except => [:index]
-   before_filter :find_optional_project, :only => [:index]
-   before_filter :check_for_default_issue_status, :only => [:new, :create]
-@@ -352,6 +353,13 @@ class IssuesController < ApplicationCont
-     render_404
-   end
- 
-+  def find_project_from_issue
-+    project_id = (params[:issue] && params[:issue][:project_id])
-+    @project = Project.find(project_id)
-+  rescue ActiveRecord::RecordNotFound
-+    render_404
-+  end
-+
-   def retrieve_previous_and_next_issue_ids
-     retrieve_query_from_session
-     if @query
-@@ -419,7 +427,7 @@ class IssuesController < ApplicationCont
-       end
-       @issue.project = @project
-     else
--      @issue = @project.issues.visible.find(params[:id])
-+      @issue = Issue.visible.find(params[:id])
-     end
- 
-     @issue.project = @project
diff --git a/debian/patches/gemfile-adjustments.patch b/debian/patches/gemfile-adjustments.patch
deleted file mode 100644
index 3a2f6e1..0000000
--- a/debian/patches/gemfile-adjustments.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -1,10 +1,10 @@
- source 'https://rubygems.org'
- 
--gem "rails", "4.1.4"
-+gem "rails", "~> 4.1.4"
- gem "jquery-rails", "~> 3.1.1"
- gem "coderay", "~> 1.1.0"
- gem "builder", ">= 3.0.4"
--gem "request_store", "1.0.5"
-+gem "request_store", ">= 1.0.5"
- gem "mime-types"
- gem "awesome_nested_set", ">= 3.0.0.rc.6"
- gem "protected_attributes"
-@@ -15,12 +15,12 @@ gem 'tzinfo-data', platforms: [:mingw, :
- 
- # Optional gem for LDAP authentication
- group :ldap do
--  gem "net-ldap", "~> 0.3.1"
-+  gem "net-ldap", ">= 0.3.1"
- end
- 
- # Optional gem for OpenID authentication
- group :openid do
--  gem "ruby-openid", "~> 2.3.0", :require => "openid"
-+  gem "ruby-openid", ">= 2.3.0", :require => "openid"
-   gem "rack-openid"
- end
- 
-@@ -32,7 +32,7 @@ platforms :mri, :mingw do
- 
-   # Optional Markdown support, not for JRuby
-   group :markdown do
--    gem "redcarpet", "~> 3.1.2"
-+    gem "redcarpet", "~> 3.1"
-   end
- end
- 
-@@ -46,8 +46,11 @@ end
- # configuration file
- require 'erb'
- require 'yaml'
--database_file = File.join(File.dirname(__FILE__), "config/database.yml")
--if File.exist?(database_file)
-+# FIXME duplicating logic in config/application.rb
-+ENV['X_DEBIAN_SITEID'] ||= 'default'
-+ENV['RAILS_ETC'] = "/etc/redmine/#{ENV['X_DEBIAN_SITEID']}"
-+database_file = File.join(ENV['RAILS_ETC'], "database.yml")
-+if File.readable?(database_file)
-   database_config = YAML::load(ERB.new(IO.read(database_file)).result)
-   adapters = database_config.values.map {|c| c['adapter']}.compact.uniq
-   if adapters.any?
-@@ -78,21 +81,6 @@ else
-   warn("Please configure your config/database.yml first")
- end
- 
--group :development do
--  gem "rdoc", ">= 2.4.2"
--  gem "yard"
--end
--
--group :test do
--  gem "minitest"
--  gem "shoulda"
--  gem "shoulda-context"
--  gem "mocha", :require => 'mocha/api'
--  # For running UI tests
--  gem "capybara", "~> 2.1.0"
--  gem "selenium-webdriver"
--end
--
- local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
- if File.exists?(local_gemfile)
-   eval_gemfile local_gemfile
diff --git a/debian/patches/invalidate-language-cache-from-older-versions.diff b/debian/patches/invalidate-language-cache-from-older-versions.diff
deleted file mode 100644
index 8acfb3c..0000000
--- a/debian/patches/invalidate-language-cache-from-older-versions.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Make sure that invalid cache from older versions is not used for languages_options
-Author: Jean-Philippe Lang <jp_lang at yahoo.fr>
-Origin: upstream
-Bug-Debian: https://bugs.debian.org/764230
-Applied-Upstream: https://www.redmine.org/projects/redmine/repository/revisions/13544
-Reviewed-by: Antonio Terceiro <terceiro at debian.org>
-Last-Update: 2014-11-30
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/lib/redmine/i18n.rb
-+++ b/lib/redmine/i18n.rb
-@@ -92,7 +92,7 @@ module Redmine
-     #
-     # The result is cached to prevent from loading all translations files.
-     def languages_options
--      ActionController::Base.cache_store.fetch "i18n/languages_options" do
-+      ActionController::Base.cache_store.fetch "i18n/languages_options/#{Redmine::VERSION}" do
-         valid_languages.map {|lang| [ll(lang.to_s, :general_lang_name), lang.to_s]}.sort {|x,y| x.first <=> y.first }
-       end
-     end
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8311190..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,14 +0,0 @@
-2002_FHS_through_env_vars.patch
-2003_externalize_session_config.patch
-2004_FHS_plugins_assets.patch
-2008_force_table_encoding_mysql.patch
-2009_FHS_thin_config.patch
-2018_get_rid_of_rdoctask.patch
-1001_Parsedate.parsedate.patch
-2020_load_awesome_nested_set.patch
-gemfile-adjustments.patch
-drop-update_all.patch
-invalidate-language-cache-from-older-versions.diff
-avoid-crash-on-issues.diff
-0001-Escape-flash-messages-19117.patch
-fix-move-issue-between-projects.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