From ddd6a51f9bb38910eddd7b52502cba3b43cdaba1 Mon Sep 17 00:00:00 2001 From: Winnie Hellmann Date: Fri, 24 May 2019 14:28:39 +0000 Subject: Clarify that /copy_metadata only works within same project --- doc/user/project/quick_actions.md | 2 +- lib/gitlab/quick_actions/issue_and_merge_request_actions.rb | 2 +- locale/gitlab.pot | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/user/project/quick_actions.md b/doc/user/project/quick_actions.md index 15eb862b431..1d640966013 100644 --- a/doc/user/project/quick_actions.md +++ b/doc/user/project/quick_actions.md @@ -35,7 +35,7 @@ discussions, and descriptions: | `/label ~label1 ~label2` | Add label(s). Label names can also start without ~ but mixed syntax is not supported. | ✓ | ✓ | | `/unlabel ~label1 ~label2` | Remove all or specific label(s)| ✓ | ✓ | | `/relabel ~label1 ~label2` | Replace label | ✓ | ✓ | -| /copy_metadata #issue | !merge_request | Copy labels and milestone from other issue or merge request | ✓ | ✓ | +| /copy_metadata #issue | !merge_request | Copy labels and milestone from other issue or merge request in the project | ✓ | ✓ | | /estimate <1w 3d 2h 14m> | Set time estimate | ✓ | ✓ | | `/remove_estimate` | Remove time estimate | ✓ | ✓ | | /spend <time(1h 30m | -1h 5m)> <date(YYYY-MM-DD)> | Add or subtract spent time; optionally, specify the date that time was spent on | ✓ | ✓ | diff --git a/lib/gitlab/quick_actions/issue_and_merge_request_actions.rb b/lib/gitlab/quick_actions/issue_and_merge_request_actions.rb index 1cd158db2b0..e1579cfddc0 100644 --- a/lib/gitlab/quick_actions/issue_and_merge_request_actions.rb +++ b/lib/gitlab/quick_actions/issue_and_merge_request_actions.rb @@ -102,7 +102,7 @@ module Gitlab @updates[:milestone_id] = nil end - desc _('Copy labels and milestone from other issue or merge request') + desc _('Copy labels and milestone from other issue or merge request in this project') explanation do |source_issuable| _("Copy labels and milestone from %{source_issuable_reference}.") % { source_issuable_reference: source_issuable.to_reference } end diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 0400186f15b..f16c00250a6 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -2906,7 +2906,7 @@ msgstr "" msgid "Copy labels and milestone from %{source_issuable_reference}." msgstr "" -msgid "Copy labels and milestone from other issue or merge request" +msgid "Copy labels and milestone from other issue or merge request in this project" msgstr "" msgid "Copy link" -- cgit v1.2.1