##// END OF EJS Templates
Merged r14053 (#19253)....
Jean-Philippe Lang -
r13680:fc4d0539c0ee
parent child
Show More
@@ -92,7 +92,7 class RepositoriesController < ApplicationController
92
92
93 def committers
93 def committers
94 @committers = @repository.committers
94 @committers = @repository.committers
95 @users = @project.users
95 @users = @project.users.to_a
96 additional_user_ids = @committers.collect(&:last).collect(&:to_i) - @users.collect(&:id)
96 additional_user_ids = @committers.collect(&:last).collect(&:to_i) - @users.collect(&:id)
97 @users += User.where(:id => additional_user_ids).to_a unless additional_user_ids.empty?
97 @users += User.where(:id => additional_user_ids).to_a unless additional_user_ids.empty?
98 @users.compact!
98 @users.compact!
@@ -279,6 +279,15 class RepositoriesControllerTest < ActionController::TestCase
279 assert_select 'input[value=foo] + select option[selected=selected]', 0 # no option selected
279 assert_select 'input[value=foo] + select option[selected=selected]', 0 # no option selected
280 end
280 end
281
281
282 def test_get_committers_without_changesets
283 Changeset.delete_all
284 @request.session[:user_id] = 2
285
286 get :committers, :id => 10
287 assert_response :success
288 assert_template 'committers'
289 end
290
282 def test_post_committers
291 def test_post_committers
283 @request.session[:user_id] = 2
292 @request.session[:user_id] = 2
284 # add a commit with an unknown user
293 # add a commit with an unknown user
General Comments 0
You need to be logged in to leave comments. Login now