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:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-08-25 18:12:14 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-08-25 18:12:14 +0300
commit5f85444a43df1c5f025b520fdbc682cbf95d3ca0 (patch)
treea224ff70de072fe19ff19c0bfec2c5cafe966cc5 /app/models/resource_timebox_event.rb
parent73507eaf1a77c5c05ae17c9f7ac29bbeb8bf5be1 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/resource_timebox_event.rb')
-rw-r--r--app/models/resource_timebox_event.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/resource_timebox_event.rb b/app/models/resource_timebox_event.rb
index 6bde8e63d35..26bf2a225d4 100644
--- a/app/models/resource_timebox_event.rb
+++ b/app/models/resource_timebox_event.rb
@@ -5,8 +5,9 @@ class ResourceTimeboxEvent < ResourceEvent
include IssueResourceEvent
include MergeRequestResourceEvent
+ include Importable
- validate :exactly_one_issuable
+ validate :exactly_one_issuable, unless: :importing?
enum action: {
add: 1,