diff --git a/app/services/slash_commands/interpret_service.rb b/app/services/slash_commands/interpret_service.rb
index 50e2a96eefbf8418c326f952ff12baeaeb1c4ddb..f7b9547bd2b74cdd0c4e28cd70bbdab30ac69536 100644
--- a/app/services/slash_commands/interpret_service.rb
+++ b/app/services/slash_commands/interpret_service.rb
@@ -39,8 +39,8 @@ module SlashCommands
end
condition do
noteable.persisted? &&
- noteable.open? &&
- current_user.can?(:"update_#{noteable.to_ability_name}", noteable)
+ noteable.open? &&
+ current_user.can?(:"update_#{noteable.to_ability_name}", noteable)
end
command :close do
@updates[:state_event] = 'close'
@@ -51,9 +51,9 @@ module SlashCommands
end
condition do
noteable.closed? &&
- current_user.can?(:"update_#{noteable.to_ability_name}", noteable)
+ current_user.can?(:"update_#{noteable.to_ability_name}", noteable)
end
- command :open, :reopen do
+ command :reopen, :open do
@updates[:state_event] = 'reopen'
end
@@ -61,7 +61,7 @@ module SlashCommands
params '<New title>'
condition do
noteable.persisted? &&
- current_user.can?(:"update_#{noteable.to_ability_name}", noteable)
+ current_user.can?(:"update_#{noteable.to_ability_name}", noteable)
end
command :title do |title_param|
@updates[:title] = title_param
@@ -72,7 +72,7 @@ module SlashCommands
condition do
current_user.can?(:"admin_#{noteable.to_ability_name}", project)
end
- command :assign, :reassign do |assignee_param|
+ command :assign do |assignee_param|
user = extract_references(assignee_param, :user).first
user ||= User.find_by(username: assignee_param)
user ||= User.find_by(name: assignee_param)
@@ -83,7 +83,7 @@ module SlashCommands
desc 'Remove assignee'
condition do
noteable.assignee_id? &&
- current_user.can?(:"admin_#{noteable.to_ability_name}", project)
+ current_user.can?(:"admin_#{noteable.to_ability_name}", project)
end
command :unassign, :remove_assignee do
@updates[:assignee_id] = nil
@@ -93,7 +93,7 @@ module SlashCommands
params '%"milestone"'
condition do
current_user.can?(:"admin_#{noteable.to_ability_name}", project) &&
- project.milestones.active.any?
+ project.milestones.active.any?
end
command :milestone do |milestone_param|
milestone = extract_references(milestone_param, :milestone).first
@@ -105,7 +105,7 @@ module SlashCommands
desc 'Remove milestone'
condition do
noteable.milestone_id? &&
- current_user.can?(:"admin_#{noteable.to_ability_name}", project)
+ current_user.can?(:"admin_#{noteable.to_ability_name}", project)
end
command :clear_milestone, :remove_milestone do
@updates[:milestone_id] = nil
@@ -115,7 +115,7 @@ module SlashCommands
params '~label1 ~"label 2"'
condition do
current_user.can?(:"admin_#{noteable.to_ability_name}", project) &&
- project.labels.any?
+ project.labels.any?
end
command :label, :labels do |labels_param|
label_ids = find_label_ids(labels_param)
@@ -127,7 +127,7 @@ module SlashCommands
params '~label1 ~"label 2"'
condition do
noteable.labels.any? &&
- current_user.can?(:"admin_#{noteable.to_ability_name}", project)
+ current_user.can?(:"admin_#{noteable.to_ability_name}", project)
end
command :unlabel, :remove_label, :remove_labels do |labels_param|
label_ids = find_label_ids(labels_param)
@@ -138,7 +138,7 @@ module SlashCommands
desc 'Remove all labels'
condition do
noteable.labels.any? &&
- current_user.can?(:"admin_#{noteable.to_ability_name}", project)
+ current_user.can?(:"admin_#{noteable.to_ability_name}", project)
end
command :clear_labels, :clear_label do
@updates[:label_ids] = []
@@ -147,7 +147,7 @@ module SlashCommands
desc 'Add a todo'
condition do
noteable.persisted? &&
- !TodoService.new.todo_exist?(noteable, current_user)
+ !TodoService.new.todo_exist?(noteable, current_user)
end
command :todo do
@updates[:todo_event] = 'add'
@@ -155,7 +155,7 @@ module SlashCommands
desc 'Mark todo as done'
condition do
- TodoService.new.todo_exist?(noteable, current_user)
+ TodoService.new.todo_exist?(noteable, current_user)
end
command :done do
@updates[:todo_event] = 'done'
@@ -164,7 +164,7 @@ module SlashCommands
desc 'Subscribe'
condition do
noteable.persisted? &&
- !noteable.subscribed?(current_user)
+ !noteable.subscribed?(current_user)
end
command :subscribe do
@updates[:subscription_event] = 'subscribe'
@@ -173,17 +173,17 @@ module SlashCommands
desc 'Unsubscribe'
condition do
noteable.persisted? &&
- noteable.subscribed?(current_user)
+ noteable.subscribed?(current_user)
end
command :unsubscribe do
@updates[:subscription_event] = 'unsubscribe'
end
desc 'Set due date'
- params '<in 2 days | this Friday | December 31st>'
+ params '<in 2 days; this Friday; December 31st>'
condition do
noteable.respond_to?(:due_date) &&
- current_user.can?(:"update_#{noteable.to_ability_name}", noteable)
+ current_user.can?(:"update_#{noteable.to_ability_name}", noteable)
end
command :due, :due_date do |due_date_param|
due_date = Chronic.parse(due_date_param).try(:to_date)
@@ -194,8 +194,8 @@ module SlashCommands
desc 'Remove due date'
condition do
noteable.respond_to?(:due_date) &&
- noteable.due_date? &&
- current_user.can?(:"update_#{noteable.to_ability_name}", noteable)
+ noteable.due_date? &&
+ current_user.can?(:"update_#{noteable.to_ability_name}", noteable)
end
command :clear_due_date do
@updates[:due_date] = nil
@@ -204,7 +204,7 @@ module SlashCommands
# This is a dummy command, so that it appears in the autocomplete commands
desc 'CC'
params '@user'
- command :cc, noop: true
+ command :cc
def find_label_ids(labels_param)
label_ids_by_reference = extract_references(labels_param, :label).map(&:id)
diff --git a/doc/workflow/slash_commands.md b/doc/workflow/slash_commands.md
index 2bdc18ad2489398c8c9f6dbbfe088f9e5fa42971..e787d421fa849ba8efecc5ad6b94cc15247722ab 100644
--- a/doc/workflow/slash_commands.md
+++ b/doc/workflow/slash_commands.md
@@ -12,9 +12,9 @@ do.
| Command | Aliases | Action |
|:---------------------------|:--------------------|:-------------|
| `/close` | None | Close the issue or merge request |
-| `/open` | `/reopen` | Reopen the issue or merge request |
+| `/reopen` | `/open` | Reopen the issue or merge request |
| `/title <New title>` | None | Change title |
-| `/assign @username` | `/reassign` | Assign |
+| `/assign @username` | None | Assign |
| `/unassign` | `/remove_assignee` | Remove assignee |
| `/milestone %milestone` | None | Set milestone |
| `/clear_milestone` | `/remove_milestone` | Remove milestone |
@@ -25,5 +25,5 @@ do.
| `/done` | None | Mark todo as done |
| `/subscribe` | None | Subscribe |
| `/unsubscribe` | None | Unsubscribe |
-| `/due <in 2 days | this Friday | December 31st>` | `/due_date` | Set due date |
+| `/due <in 2 days; this Friday; December 31st>` | `/due_date` | Set due date |
| `/clear_due_date` | None | Remove due date |