[DRE-commits] r4483 - in trunk/redmine/debian: . patches
Jérémy Lal
kapouer-guest at alioth.debian.org
Thu Dec 24 09:07:42 UTC 2009
Author: kapouer-guest
Date: 2009-12-24 09:07:42 +0000 (Thu, 24 Dec 2009)
New Revision: 4483
Removed:
trunk/redmine/debian/patches/version.patch
Modified:
trunk/redmine/debian/changelog
trunk/redmine/debian/patches/revert_rails_2.3.patch
trunk/redmine/debian/patches/series
Log:
Upstream update. Remove version patch, no longer needed.
Modified: trunk/redmine/debian/changelog
===================================================================
--- trunk/redmine/debian/changelog 2009-12-24 09:07:33 UTC (rev 4482)
+++ trunk/redmine/debian/changelog 2009-12-24 09:07:42 UTC (rev 4483)
@@ -1,4 +1,4 @@
-redmine (0.9.0~svn3166-1) UNRELEASED; urgency=low
+redmine (0.9.0~svn3235-1) UNRELEASED; urgency=low
* Upstream update.
* Stop using deprecated dbfile param in database.yml.
Modified: trunk/redmine/debian/patches/revert_rails_2.3.patch
===================================================================
--- trunk/redmine/debian/patches/revert_rails_2.3.patch 2009-12-24 09:07:33 UTC (rev 4482)
+++ trunk/redmine/debian/patches/revert_rails_2.3.patch 2009-12-24 09:07:42 UTC (rev 4483)
@@ -1,3 +1,19 @@
+diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
+index 20a8e57..b388812 100644
+--- a/app/controllers/application_controller.rb
++++ b/app/controllers/application_controller.rb
+@@ -22,6 +22,11 @@ class ApplicationController < ActionController::Base
+ include Redmine::I18n
+
+ layout 'base'
++
++ # In case the cookie store secret changes
++ rescue_from CGI::Session::CookieStore::TamperedWithCookie do |exception|
++ render :text => 'Your session was invalid and has been reset. Please, reload this page.', :status => 500
++ end
+
+ # Remove broken cookie after upgrade from 0.8.x (#4292)
+ # See https://rails.lighthouseapp.com/projects/8994/tickets/3360
diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb
index 4836229..1b69fb4 100644
--- a/app/models/enumeration.rb
@@ -23,7 +39,7 @@
def self.default
# Creates a fake default scope so Enumeration.default will check
diff --git a/app/models/issue.rb b/app/models/issue.rb
-index a550779..40d58d9 100644
+index b9e0461..ed45efb 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -157,7 +157,7 @@ class Issue < ActiveRecord::Base
@@ -36,10 +52,10 @@
alias_method_chain :attributes=, :tracker_first
diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
-index cda556f..5eeb89c 100644
+index 98536a8..1f5130f 100644
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
-@@ -87,7 +87,7 @@ class MailHandler < ActionMailer::Base
+@@ -89,7 +89,7 @@ class MailHandler < ActionMailer::Base
if headers.detect {|h| h.to_s =~ MESSAGE_ID_RE}
klass, object_id = $1, $2.to_i
method_name = "receive_#{klass}_reply"
@@ -48,7 +64,7 @@
send method_name, object_id
else
# ignoring it
-@@ -126,8 +126,7 @@ class MailHandler < ActionMailer::Base
+@@ -131,8 +131,7 @@ class MailHandler < ActionMailer::Base
if status && issue.new_statuses_allowed_to(user).include?(status)
issue.status = status
end
@@ -59,7 +75,7 @@
issue.subject = '(no subject)'
end
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
-index 3d5231d..fbe76ac 100644
+index dfd2737..2f6a990 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -16,7 +16,6 @@
@@ -103,7 +119,7 @@
end
# Builds a tmail object used to email recipients of a project when an attachements are added.
-@@ -127,7 +121,6 @@ class Mailer < ActionMailer::Base
+@@ -129,7 +123,6 @@ class Mailer < ActionMailer::Base
body :attachments => attachments,
:added_to => added_to,
:added_to_url => added_to_url
@@ -111,15 +127,15 @@
end
# Builds a tmail object used to email recipients of a news' project when a news item is added.
-@@ -142,7 +135,6 @@ class Mailer < ActionMailer::Base
+@@ -144,7 +137,6 @@ class Mailer < ActionMailer::Base
subject "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
body :news => news,
:news_url => url_for(:controller => 'news', :action => 'show', :id => news)
- render_multipart('news_added', body)
end
- # Builds a tmail object used to email the specified recipients of the specified message that was posted.
-@@ -159,7 +151,6 @@ class Mailer < ActionMailer::Base
+ # Builds a tmail object used to email the recipients of the specified message that was posted.
+@@ -162,7 +154,6 @@ class Mailer < ActionMailer::Base
subject "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
body :message => message,
:message_url => url_for(:controller => 'messages', :action => 'show', :board_id => message.board_id, :id => message.root)
@@ -127,7 +143,7 @@
end
# Builds a tmail object used to email the recipients of a project of the specified wiki content was added.
-@@ -176,7 +167,6 @@ class Mailer < ActionMailer::Base
+@@ -179,7 +170,6 @@ class Mailer < ActionMailer::Base
subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_added, :page => wiki_content.page.pretty_title)}"
body :wiki_content => wiki_content,
:wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :page => wiki_content.page.title)
@@ -135,7 +151,7 @@
end
# Builds a tmail object used to email the recipients of a project of the specified wiki content was updated.
-@@ -194,7 +184,6 @@ class Mailer < ActionMailer::Base
+@@ -197,7 +187,6 @@ class Mailer < ActionMailer::Base
body :wiki_content => wiki_content,
:wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :page => wiki_content.page.title),
:wiki_diff_url => url_for(:controller => 'wiki', :action => 'diff', :id => wiki_content.project, :page => wiki_content.page.title, :version => wiki_content.version)
@@ -143,7 +159,7 @@
end
# Builds a tmail object used to email the specified user their account information.
-@@ -209,7 +198,6 @@ class Mailer < ActionMailer::Base
+@@ -212,7 +201,6 @@ class Mailer < ActionMailer::Base
body :user => user,
:password => password,
:login_url => url_for(:controller => 'account', :action => 'login')
@@ -151,7 +167,7 @@
end
# Builds a tmail object used to email all active administrators of an account activation request.
-@@ -223,7 +211,6 @@ class Mailer < ActionMailer::Base
+@@ -226,7 +214,6 @@ class Mailer < ActionMailer::Base
subject l(:mail_subject_account_activation_request, Setting.app_title)
body :user => user,
:url => url_for(:controller => 'users', :action => 'index', :status => User::STATUS_REGISTERED, :sort_key => 'created_on', :sort_order => 'desc')
@@ -159,7 +175,7 @@
end
# Builds a tmail object used to email the specified user that their account was activated by an administrator.
-@@ -237,7 +224,6 @@ class Mailer < ActionMailer::Base
+@@ -240,7 +227,6 @@ class Mailer < ActionMailer::Base
subject l(:mail_subject_register, Setting.app_title)
body :user => user,
:login_url => url_for(:controller => 'account', :action => 'login')
@@ -167,7 +183,7 @@
end
def lost_password(token)
-@@ -246,7 +232,6 @@ class Mailer < ActionMailer::Base
+@@ -249,7 +235,6 @@ class Mailer < ActionMailer::Base
subject l(:mail_subject_lost_password, Setting.app_title)
body :token => token,
:url => url_for(:controller => 'account', :action => 'lost_password', :token => token.value)
@@ -175,7 +191,7 @@
end
def register(token)
-@@ -255,7 +240,6 @@ class Mailer < ActionMailer::Base
+@@ -258,7 +243,6 @@ class Mailer < ActionMailer::Base
subject l(:mail_subject_register, Setting.app_title)
body :token => token,
:url => url_for(:controller => 'account', :action => 'activate', :token => token.value)
@@ -183,7 +199,7 @@
end
def test(user)
-@@ -263,7 +247,6 @@ class Mailer < ActionMailer::Base
+@@ -266,7 +250,6 @@ class Mailer < ActionMailer::Base
recipients user.mail
subject 'Redmine test'
body :url => url_for(:controller => 'welcome')
@@ -191,7 +207,7 @@
end
# Overrides default deliver! method to prevent from sending an email
-@@ -344,22 +327,26 @@ class Mailer < ActionMailer::Base
+@@ -347,22 +330,26 @@ class Mailer < ActionMailer::Base
super
end
@@ -233,10 +249,10 @@
# Makes partial rendering work with Rails 1.2 (retro-compatibility)
diff --git a/app/models/query.rb b/app/models/query.rb
-index 2e1680a..33d9491 100644
+index afbb687..9b27e4a 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
-@@ -429,6 +429,9 @@ class Query < ActiveRecord::Base
+@@ -430,6 +430,9 @@ class Query < ActiveRecord::Base
r = r.keys.inject({}) {|h, k| h[c.custom_field.cast_value(k)] = r[k]; h}
end
end
@@ -247,14 +263,14 @@
rescue ::ActiveRecord::StatementInvalid => e
raise StatementInvalid.new(e.message)
diff --git a/config/environment.rb b/config/environment.rb
-index 1df06f5..1f7d23e 100644
+index 97fc54a..1f7d23e 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -5,7 +5,7 @@
# ENV['RAILS_ENV'] ||= 'production'
# Specifies gem version of Rails to use when vendor/rails is not present
--RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
+-RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.2.3' unless defined? RAILS_GEM_VERSION
# Bootstrap the Rails environment, frameworks, and default configuration
@@ -321,43 +337,6 @@
+end
+
+
-diff --git a/config/initializers/action_group_test.rb b/config/initializers/action_group_test.rb
-new file mode 100644
-index 0000000..8ac2f4c
---- /dev/null
-+++ b/config/initializers/action_group_test.rb
-@@ -0,0 +1,31 @@
-+require 'action_view/test_case'
-+module ActionView
-+ class FormOptionsHelperTest < TestCase
-+ def test_grouped_options_for_select_with_array
-+ assert_dom_equal(
-+ "<optgroup label=\"North America\"><option value=\"US\">United States</option>\n<option value=\"Canada\">Canada</option></optgroup><optgroup label=\"Europe\"><option value=\"GB\">Great Britain</option>\n<option value=\"Germany\">Germany</option></optgroup>",
-+ grouped_options_for_select([
-+ ["North America",
-+ [['United States','US'],"Canada"]],
-+ ["Europe",
-+ [["Great Britain","GB"], "Germany"]]
-+ ])
-+ )
-+ end
-+
-+ def test_grouped_options_for_select_with_selected_and_prompt
-+ assert_dom_equal(
-+ "<option value=\"\">Choose a product...</option><optgroup label=\"Hats\"><option value=\"Baseball Cap\">Baseball Cap</option>\n<option selected=\"selected\" value=\"Cowboy Hat\">Cowboy Hat</option></optgroup>",
-+ grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]], "Cowboy Hat", "Choose a product...")
-+ )
-+ end
-+
-+ def test_optgroups_with_with_options_with_hash
-+ assert_dom_equal(
-+ "<optgroup label=\"Europe\"><option value=\"Denmark\">Denmark</option>\n<option value=\"Germany\">Germany</option></optgroup><optgroup label=\"North America\"><option value=\"United States\">United States</option>\n<option value=\"Canada\">Canada</option></optgroup>",
-+ grouped_options_for_select({'North America' => ['United States','Canada'], 'Europe' => ['Denmark','Germany']})
-+ )
-+ end
-+ end
-+end
-+
diff --git a/lib/SVG/Graph/Graph.rb b/lib/SVG/Graph/Graph.rb
index 497bb7c..c188ae5 100644
--- a/lib/SVG/Graph/Graph.rb
@@ -415,7 +394,7 @@
lines = 0
diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
-index b8ff4f0..18a1cb8 100644
+index dfc6caf..0f6e4bf 100644
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -141,7 +141,7 @@ class MailerTest < ActiveSupport::TestCase
@@ -435,7 +414,7 @@
+ assert_equal Mailer.message_id_for(message.parent), mail.references.to_s
end
- # test mailer methods for each language
+ context("#issue_add") do
diff --git a/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb b/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb
index 6be3c5e..fb67341 100644
--- a/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb
Modified: trunk/redmine/debian/patches/series
===================================================================
--- trunk/redmine/debian/patches/series 2009-12-24 09:07:33 UTC (rev 4482)
+++ trunk/redmine/debian/patches/series 2009-12-24 09:07:42 UTC (rev 4483)
@@ -1,5 +1,4 @@
wrong_path_for_interpreter.patch
-version.patch
revert_rails_2.3.patch
01_paths.patch
02_session_path.patch
Deleted: trunk/redmine/debian/patches/version.patch
===================================================================
--- trunk/redmine/debian/patches/version.patch 2009-12-24 09:07:33 UTC (rev 4482)
+++ trunk/redmine/debian/patches/version.patch 2009-12-24 09:07:42 UTC (rev 4483)
@@ -1,15 +0,0 @@
-diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
-index bbd1f3d..727efbb 100644
---- a/lib/redmine/version.rb
-+++ b/lib/redmine/version.rb
-@@ -3,8 +3,8 @@ require 'rexml/document'
- module Redmine
- module VERSION #:nodoc:
- MAJOR = 0
-- MINOR = 8
-- TINY = 7
-+ MINOR = 9
-+ TINY = 0
-
- # Branch values:
- # * official release: nil
More information about the Pkg-ruby-extras-commits
mailing list