Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/work_item.rb')
-rw-r--r--app/models/work_item.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/models/work_item.rb b/app/models/work_item.rb
index 24d1078516e..9f28ffbf7b6 100644
--- a/app/models/work_item.rb
+++ b/app/models/work_item.rb
@@ -4,7 +4,7 @@ class WorkItem < Issue
include Gitlab::Utils::StrongMemoize
COMMON_QUICK_ACTIONS_COMMANDS = [
- :title, :reopen, :close, :cc, :tableflip, :shrug, :type
+ :title, :reopen, :close, :cc, :tableflip, :shrug, :type, :promote_to
].freeze
self.table_name = 'issues'
@@ -168,8 +168,9 @@ class WorkItem < Issue
errors.add(
:work_item_type_id,
format(
- _('cannot be changed to %{new_type} with %{parent_type} as parent type.'),
- new_type: work_item_type.name, parent_type: parent_link.work_item_parent.work_item_type.name
+ _('cannot be changed to %{new_type} when linked to a parent %{parent_type}.'),
+ new_type: work_item_type.name.downcase,
+ parent_type: parent_link.work_item_parent.work_item_type.name.downcase
)
)
end