From 83b356484af33117ab8928bc9b75db5e2805ebf6 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 24 Oct 2012 10:33:15 +0000
Subject: [PATCH] Merged r10709 from trunk to 1.4-stable (#12196)

fix "Page not found" on OK button in SCM "View all revisions" page.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10711 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/repositories/revisions.html.erb         |  3 ++-
 doc/CHANGELOG                                     |  1 +
 .../repositories_git_controller_test.rb           | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/views/repositories/revisions.html.erb b/app/views/repositories/revisions.html.erb
index e2878fb7b..afa248f35 100644
--- a/app/views/repositories/revisions.html.erb
+++ b/app/views/repositories/revisions.html.erb
@@ -1,7 +1,8 @@
 <div class="contextual">
 <% form_tag(
        {:action => 'revision', :id => @project,
-        :repository_id => @repository.identifier_param}
+        :repository_id => @repository.identifier_param},
+       :method => :get
      ) do %>
   <%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 8 %>
   <%= submit_tag 'OK' %>
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index eeb905dd6..1bd8133a3 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -14,6 +14,7 @@ http://www.redmine.org/
 * Defect #11541: Version sharing is missing in the REST API
 * Defect #11789: Edit section links broken with h5/h6 headings
 * Defect #12189: No tmp/pdf directory
+* Defect #12196: "Page not found" on OK button in SCM "View all revisions" page
 * Feature #11338: Exclude emails with auto-submitted => auto-generated
 * Patch #9732: German translations
 * Patch #11328: Fix Japanese mistranslation for 'label_language_based'
diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index 995e0a6b6..0ac8486d1 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -547,6 +547,21 @@ class RepositoriesGitControllerTest < ActionController::TestCase
       end
     end
 
+    def test_revisions
+      assert_equal 0, @repository.changesets.count
+      @repository.fetch_changesets
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
+      get :revisions, :id => PRJ_ID
+      assert_response :success
+      assert_template 'revisions'
+      assert_tag :tag => 'form',
+                 :attributes => {
+                   :method => 'get',
+                   :action => '/projects/subproject1/repository/revision'
+                 }
+    end
+
     def test_revision
       assert_equal 0, @repository.changesets.count
       @repository.fetch_changesets