Browse Source

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
tags/3.1.0
Jean-Philippe Lang 9 years ago
parent
commit
730bba8130

+ 1
- 1
app/controllers/repositories_controller.rb View File

@@ -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!

+ 9
- 0
test/functional/repositories_controller_test.rb View File

@@ -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

Loading…
Cancel
Save