diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 15:09:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 15:09:18 +0300 |
| commit | b7c735c8ac11b8182807070fc6f84f2606e15427 (patch) | |
| tree | e74b4d25abb8bbf23546f001dd94515e2840a3a3 /lib/gitlab | |
| parent | 221b529789f4090341a825695aeb49b8df6dd11d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/import_export/project/relation_factory.rb | 3 | ||||
| -rw-r--r-- | lib/gitlab/metrics/dashboard/stages/panel_ids_inserter.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab/import_export/project/relation_factory.rb b/lib/gitlab/import_export/project/relation_factory.rb index 2405176c518..f7f1195f2f1 100644 --- a/lib/gitlab/import_export/project/relation_factory.rb +++ b/lib/gitlab/import_export/project/relation_factory.rb @@ -70,8 +70,7 @@ module Gitlab # Do not create relation if it is: # - An unknown service # - A legacy trigger - unknown_service? || - (!Feature.enabled?(:use_legacy_pipeline_triggers, @importable) && legacy_trigger?) + unknown_service? || legacy_trigger? end def setup_models diff --git a/lib/gitlab/metrics/dashboard/stages/panel_ids_inserter.rb b/lib/gitlab/metrics/dashboard/stages/panel_ids_inserter.rb index 301c54b9f23..239b5161256 100644 --- a/lib/gitlab/metrics/dashboard/stages/panel_ids_inserter.rb +++ b/lib/gitlab/metrics/dashboard/stages/panel_ids_inserter.rb @@ -15,6 +15,9 @@ module Gitlab insert_panel_id(id, panel) end + rescue ActiveModel::UnknownAttributeError => error + remove_panel_ids! + Gitlab::ErrorTracking.log_exception(error) end private |