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>2023-09-27 09:09:27 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-09-27 09:09:27 +0300
commit605f9296cc7bb39665ea5d07b7dad9a8eda4c26d (patch)
treee5ca560af7c94643ec00e11e32fd85d5eed12ceb /app/models
parent0a0dcc392ca69b7f0567bff6bc1040ded035a11b (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
-rw-r--r--app/models/concerns/reset_on_column_errors.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/concerns/reset_on_column_errors.rb b/app/models/concerns/reset_on_column_errors.rb
index 8786b5d4f4b..8ace52ebff5 100644
--- a/app/models/concerns/reset_on_column_errors.rb
+++ b/app/models/concerns/reset_on_column_errors.rb
@@ -38,6 +38,10 @@ module ResetOnColumnErrors
end
end
+ def reset_on_union_error(exception)
+ self.class.reset_on_union_error(exception)
+ end
+
def reset_on_unknown_attribute_error(exception)
self.class.do_reset(exception) if self.class.should_reset?