Merged r10251 from trunk to 1.4-stable (#11752)

scm: git: use diff_max_lines_displayed setting at test_diff_with_rev_and_path of functional test.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10258 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/functional/repositories_git_controller_test.rb

@@ -292,6 +292,7 @@ class RepositoriesGitControllerTest < ActionController::TestCase
       @repository.fetch_changesets
       @project.reload
       assert_equal NUM_REV, @repository.changesets.count
+      with_settings :diff_max_lines_displayed => 1000 do
         # Full diff of changeset 2f9c0091
         ['inline', 'sbs'].each do |dt|
           get :diff,
@@ -310,6 +311,7 @@ class RepositoriesGitControllerTest < ActionController::TestCase
           assert_tag :tag => 'h2', :content => /2f9c0091/
         end
       end
+    end
 
     def test_diff_truncated
       assert_equal 0, @repository.changesets.count