From fc4d0539c0eee6d407735a735f4b88a6d740d48b Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 8 Mar 2015 09:44:46 +0000 Subject: [PATCH] Merged r14053 (#19253). git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14062 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/repositories_controller.rb | 2 +- test/functional/repositories_controller_test.rb | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) 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 -- 2.39.5