diff options
author | Mateusz Bajorski <ematib@gmail.com> | 2018-02-01 21:38:10 +0300 |
---|---|---|
committer | Mateusz Bajorski <ematib@gmail.com> | 2018-03-03 14:12:38 +0300 |
commit | 593e3ffc325a600a070ce6c247e33412473ec651 (patch) | |
tree | 0f913b995fb1f338d50dc4370ceae1f520c5b8f8 | |
parent | 26087ae91c0397054786bed7bcc078b03dd8752b (diff) |
Fixed inconsistent descriptions and refactored reference checking
-rw-r--r-- | app/services/quick_actions/interpret_service.rb | 4 | ||||
-rw-r--r-- | doc/user/project/quick_actions.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/services/quick_actions/interpret_service.rb b/app/services/quick_actions/interpret_service.rb index 87937fef8f4..1a0e27d551a 100644 --- a/app/services/quick_actions/interpret_service.rb +++ b/app/services/quick_actions/interpret_service.rb @@ -270,7 +270,7 @@ module QuickActions desc 'Copy labels and milestone from other issue or merge request' explanation do |issuable_id| - "Copy labels and milestone from issue or merge_request \"#{issuable_id}\"." + "Copy labels and milestone from issue or merge_request #{issuable_id}." end params '#issue | !merge_request' condition do @@ -279,7 +279,7 @@ module QuickActions end command :copy_metadata do |issuable_id| source_issuable = extract_references(issuable_id, :issue).first - source_issuable = extract_references(issuable_id, :merge_request).first if !source_issuable.present? + source_issuable ||= extract_references(issuable_id, :merge_request).first if source_issuable.present? && source_issuable.project.id == issuable.project.id @updates[:add_label_ids] = source_issuable.labels.map(&:id) diff --git a/doc/user/project/quick_actions.md b/doc/user/project/quick_actions.md index 75799caacde..3e3b699edc4 100644 --- a/doc/user/project/quick_actions.md +++ b/doc/user/project/quick_actions.md @@ -41,4 +41,4 @@ do. | `/move path/to/project` | Moves issue to another project | | `/tableflip` | Append the comment with `(╯°□°)╯︵ ┻━┻` | | `/shrug` | Append the comment with `¯\_(ツ)_/¯` | -| <code>/copy_metadata < #issue | !merge_request ></code> | Copy labels and milestone from other issue or merge request | +| <code>/copy_metadata #issue | !merge_request </code> | Copy labels and milestone from other issue or merge request | |