diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-26 09:13:36 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-26 09:13:36 +0300 |
| commit | 4b198b6289b1643b6e2571c03a377fe08e6ab504 (patch) | |
| tree | 1957ab442a82fccc8e592fc5d28ab0939023ed74 /app | |
| parent | 037063e3004a6a86352adbc73d3034e9aaade32d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_create_view.vue | 6 | ||||
| -rw-r--r-- | app/models/concerns/timebox.rb | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_create_view.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_create_view.vue index b99083713a8..88977652556 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_create_view.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_create_view.vue @@ -117,7 +117,11 @@ export default { labelCreate: { label }, }, }, - ) => this.updateLabelsInCache(store, label), + ) => { + if (label) { + this.updateLabelsInCache(store, label); + } + }, }); if (labelCreate.errors.length) { [this.error] = labelCreate.errors; diff --git a/app/models/concerns/timebox.rb b/app/models/concerns/timebox.rb index 3fe9d7f4d71..eced4505a8f 100644 --- a/app/models/concerns/timebox.rb +++ b/app/models/concerns/timebox.rb @@ -51,7 +51,7 @@ module Timebox validate :dates_within_4_digits cache_markdown_field :title, pipeline: :single_line - cache_markdown_field :description + cache_markdown_field :description, issuable_reference_expansion_enabled: true belongs_to :project belongs_to :group |