summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-03-07 16:21:59 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-03-07 16:21:59 +0000
commit730bba8130ba72d6c6d01edc5712169068d67ba7 (patch)
tree6b2d15f302dc717f36065ba0b8aa1a5d14c0b7af
parent0965aafd51bb3cd0284f3e31e566b53574a87dd6 (diff)
downloadredmine-730bba8130ba72d6c6d01edc5712169068d67ba7.tar.gz
redmine-730bba8130ba72d6c6d01edc5712169068d67ba7.zip
Fixed undefined method `compact!' error when additional_user_ids is empty (#19253).
git-svn-id: http://svn.redmine.org/redmine/trunk@14053 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/controllers/repositories_controller.rb2
-rw-r--r--test/functional/repositories_controller_test.rb9
2 files changed, 10 insertions, 1 deletions
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 6e968f909..364b834ef 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -92,7 +92,7 @@ class RepositoriesController < ApplicationController
def committers
@committers = @repository.committers
- @users = @project.users
+ @users = @project.users.to_a
additional_user_ids = @committers.collect(&:last).collect(&:to_i) - @users.collect(&:id)
@users += User.where(:id => additional_user_ids).to_a unless additional_user_ids.empty?
@users.compact!
diff --git a/test/functional/repositories_controller_test.rb b/test/functional/repositories_controller_test.rb
index 3e0fa5963..056375ca8 100644
--- a/test/functional/repositories_controller_test.rb
+++ b/test/functional/repositories_controller_test.rb
@@ -279,6 +279,15 @@ class RepositoriesControllerTest < ActionController::TestCase
assert_select 'input[value=foo] + select option[selected=selected]', 0 # no option selected
end
+ def test_get_committers_without_changesets
+ Changeset.delete_all
+ @request.session[:user_id] = 2
+
+ get :committers, :id => 10
+ assert_response :success
+ assert_template 'committers'
+ end
+
def test_post_committers
@request.session[:user_id] = 2
# add a commit with an unknown user