Commit 2d052ae0 authored by Arturo Herrero's avatar Arturo Herrero

Remove services from safe model attributes

This is not needed anymore. We can also delete the check for services
relation as they are going to be ignored by the importer.
parent 8618cdba
--- ---
title: Exclude integrations (services) from import/export title: Exclude integrations (services) from Project Import/Export
merge_request: 35249 merge_request: 35249
author: author:
type: changed type: changed
...@@ -70,10 +70,8 @@ module Gitlab ...@@ -70,10 +70,8 @@ module Gitlab
private private
def invalid_relation? def invalid_relation?
# Do not create relation if it is: # Do not create relation if it is a legacy trigger
# - A service legacy_trigger?
# - A legacy trigger
service? || legacy_trigger?
end end
def setup_models def setup_models
...@@ -137,10 +135,6 @@ module Gitlab ...@@ -137,10 +135,6 @@ module Gitlab
end end
end end
def service?
@relation_name == :services
end
def legacy_trigger? def legacy_trigger?
@relation_name == :'Ci::Trigger' && @relation_hash['owner_id'].nil? @relation_name == :'Ci::Trigger' && @relation_hash['owner_id'].nil?
end end
......
...@@ -461,36 +461,6 @@ DeployKey: ...@@ -461,36 +461,6 @@ DeployKey:
- public - public
- can_push - can_push
- last_used_at - last_used_at
Service:
- id
- type
- title
- project_id
- created_at
- updated_at
- active
- properties
- template
- instance
- alert_events
- push_events
- issues_events
- commit_events
- merge_requests_events
- tag_push_events
- note_events
- pipeline_events
- job_events
- comment_on_event_enabled
- comment_detail
- category
- default
- wiki_page_events
- confidential_issues_events
- confidential_note_events
- deployment_events
- description
- inherit_from_id
ProjectHook: ProjectHook:
- id - id
- url - url
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment