[DRE-commits] [redmine] 01/01: apply upstream patch to avoid crashes (Closes: #771849)

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository redmine.

commit a0cd22c3d6adc68370510bab3d0e8647af38917a
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Dec 4 09:41:40 2014 -0200

    apply upstream patch to avoid crashes (Closes: #771849)
---
 debian/changelog                          |  7 +++++
 debian/patches/avoid-crash-on-issues.diff | 48 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 56 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d49e889..f36fe0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+redmine (3.0~20140825-3) unstable; urgency=medium
+
+  * debian/patches/avoid-crash-on-issues.diff: apply upstream patch to avoid
+    crashes in some issue management configurations (Closes: #771849)
+
+ -- Antonio Terceiro <terceiro at debian.org>  Thu, 04 Dec 2014 09:41:50 -0200
+
 redmine (3.0~20140825-2) unstable; urgency=medium
 
   * README.Debian: update instructions to run redmine without a webserver
diff --git a/debian/patches/avoid-crash-on-issues.diff b/debian/patches/avoid-crash-on-issues.diff
new file mode 100644
index 0000000..1d50bc6
--- /dev/null
+++ b/debian/patches/avoid-crash-on-issues.diff
@@ -0,0 +1,48 @@
+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/series b/debian/patches/series
index 75d67f8..fa281e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 gemfile-adjustments.patch
 drop-update_all.patch
 invalidate-language-cache-from-older-versions.diff
+avoid-crash-on-issues.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/redmine.git