Multiple issue assignee: resolve conflicts after merging upstream
This commit is contained in:
parent
40f51c8e81
commit
9c0f2485b5
|
@ -91,41 +91,35 @@ module SlashCommands
|
||||||
end
|
end
|
||||||
|
|
||||||
desc 'Assign'
|
desc 'Assign'
|
||||||
explanation do |user|
|
explanation do |users|
|
||||||
"Assigns #{user.to_reference}." if user
|
"Assigns #{users.map(&:to_reference).to_sentence}." if users.any?
|
||||||
end
|
end
|
||||||
params '@user'
|
params '@user'
|
||||||
condition do
|
condition do
|
||||||
current_user.can?(:"admin_#{issuable.to_ability_name}", project)
|
current_user.can?(:"admin_#{issuable.to_ability_name}", project)
|
||||||
end
|
end
|
||||||
<<<<<<< HEAD
|
parse_params do |assignee_param|
|
||||||
command :assign do |assignee_param|
|
users = extract_references(assignee_param, :user)
|
||||||
user_ids = extract_references(assignee_param, :user).map(&:id)
|
|
||||||
|
|
||||||
if user_ids.empty?
|
if users.empty?
|
||||||
user_ids = User.where(username: assignee_param.split(' ').map(&:strip)).pluck(:id)
|
users = User.where(username: assignee_param.split(' ').map(&:strip))
|
||||||
end
|
end
|
||||||
|
|
||||||
next if user_ids.empty?
|
users
|
||||||
|
end
|
||||||
|
command :assign do |users|
|
||||||
|
next if users.empty?
|
||||||
|
|
||||||
if issuable.is_a?(Issue)
|
if issuable.is_a?(Issue)
|
||||||
@updates[:assignee_ids] = user_ids
|
@updates[:assignee_ids] = users.map(&:id)
|
||||||
else
|
else
|
||||||
@updates[:assignee_id] = user_ids.last
|
@updates[:assignee_id] = users.last.id
|
||||||
end
|
end
|
||||||
=======
|
|
||||||
parse_params do |assignee_param|
|
|
||||||
extract_references(assignee_param, :user).first ||
|
|
||||||
User.find_by(username: assignee_param)
|
|
||||||
end
|
|
||||||
command :assign do |user|
|
|
||||||
@updates[:assignee_id] = user.id if user
|
|
||||||
>>>>>>> 10c1bf2d77fd0ab21309d0b136cbc0ac11f56c77
|
|
||||||
end
|
end
|
||||||
|
|
||||||
desc 'Remove assignee'
|
desc 'Remove assignee'
|
||||||
explanation do
|
explanation do
|
||||||
"Removes assignee #{issuable.assignee.to_reference}."
|
"Removes assignee #{issuable.assignees.first.to_reference}."
|
||||||
end
|
end
|
||||||
condition do
|
condition do
|
||||||
issuable.persisted? &&
|
issuable.persisted? &&
|
||||||
|
|
|
@ -874,7 +874,7 @@ describe SlashCommands::InterpretService, services: true do
|
||||||
|
|
||||||
describe 'unassign command' do
|
describe 'unassign command' do
|
||||||
let(:content) { '/unassign' }
|
let(:content) { '/unassign' }
|
||||||
let(:issue) { create(:issue, project: project, assignee: developer) }
|
let(:issue) { create(:issue, project: project, assignees: [developer]) }
|
||||||
|
|
||||||
it 'includes current assignee reference' do
|
it 'includes current assignee reference' do
|
||||||
_, explanations = service.explain(content, issue)
|
_, explanations = service.explain(content, issue)
|
||||||
|
|
Loading…
Reference in New Issue