diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-25 12:09:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-25 12:09:05 +0300 |
| commit | 012ed4e4f69ab58f9d9b58140865a734fa5a9c88 (patch) | |
| tree | 5ffb4f87d8b495a89662f0e5218c9dd3f4ae0f38 /app/models/work_items | |
| parent | 5b9a8005eaf815a0cae80a8482ff3f272d33e042 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/work_items')
| -rw-r--r-- | app/models/work_items/type.rb | 6 | ||||
| -rw-r--r-- | app/models/work_items/widgets/weight.rb | 9 |
2 files changed, 4 insertions, 11 deletions
diff --git a/app/models/work_items/type.rb b/app/models/work_items/type.rb index e38d0ae153a..7c4da00479c 100644 --- a/app/models/work_items/type.rb +++ b/app/models/work_items/type.rb @@ -21,11 +21,11 @@ module WorkItems }.freeze WIDGETS_FOR_TYPE = { - issue: [Widgets::Assignees, Widgets::Description, Widgets::Hierarchy, Widgets::Weight], + issue: [Widgets::Assignees, Widgets::Description, Widgets::Hierarchy], incident: [Widgets::Description, Widgets::Hierarchy], test_case: [Widgets::Description], requirement: [Widgets::Description], - task: [Widgets::Assignees, Widgets::Description, Widgets::Hierarchy, Widgets::Weight] + task: [Widgets::Assignees, Widgets::Description, Widgets::Hierarchy] }.freeze cache_markdown_field :description, pipeline: :single_line @@ -83,3 +83,5 @@ module WorkItems end end end + +WorkItems::Type.prepend_mod diff --git a/app/models/work_items/widgets/weight.rb b/app/models/work_items/widgets/weight.rb deleted file mode 100644 index f589378f307..00000000000 --- a/app/models/work_items/widgets/weight.rb +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: true - -module WorkItems - module Widgets - class Weight < Base - delegate :weight, to: :work_item - end - end -end |