diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb index 040a10011e2c7ffdb694020dcda875e350220726..8a44e78fb44c23234a601d2ebd2c5718e97589c6 100644 --- a/lib/gitlab/import_export/relation_factory.rb +++ b/lib/gitlab/import_export/relation_factory.rb @@ -23,7 +23,7 @@ module Gitlab EXISTING_OBJECT_CHECK = %i[milestone milestones label labels project_label project_labels group_label group_labels].freeze - TOKEN_RESET_MODELS = %w[Ci::Trigger Ci::Build ProjectHook] + TOKEN_RESET_MODELS = %w[Ci::Trigger Ci::Build ProjectHook].freeze def self.create(*args) new(*args).create diff --git a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb index 75c8b997b4fca420dcf676cc854870b6d5d8fec6..40d7d59f03bba53ca3808972c1b64dca8c47fecd 100644 --- a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb +++ b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb @@ -203,11 +203,11 @@ describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do restored_project_json end - it 'has a new CI triggers token' do + it 'has a new CI trigger token' do expect(Ci::Trigger.where(token: 'cdbfasdf44a5958c83654733449e585')).to be_empty end - it 'has a new CI triggers token' do + it 'has a new CI build token' do expect(Ci::Build.where(token: 'abcd')).to be_empty end end