Commit aae6e5f1 authored by Brett Walker's avatar Brett Walker

Add member_namespace association to import/export

parent 4dae8709
...@@ -28,7 +28,6 @@ class Member < ApplicationRecord ...@@ -28,7 +28,6 @@ class Member < ApplicationRecord
belongs_to :user belongs_to :user
belongs_to :source, polymorphic: true # rubocop:disable Cop/PolymorphicAssociations belongs_to :source, polymorphic: true # rubocop:disable Cop/PolymorphicAssociations
belongs_to :member_namespace, inverse_of: :namespace_members, foreign_key: 'member_namespace_id', class_name: 'Namespace' belongs_to :member_namespace, inverse_of: :namespace_members, foreign_key: 'member_namespace_id', class_name: 'Namespace'
belongs_to :namespace, inverse_of: :namespace_route
has_one :member_task has_one :member_task
delegate :name, :username, :email, :last_activity_on, to: :user, prefix: true delegate :name, :username, :email, :last_activity_on, to: :user, prefix: true
......
...@@ -904,6 +904,7 @@ excluded_attributes: ...@@ -904,6 +904,7 @@ excluded_attributes:
- :release_id - :release_id
project_members: project_members:
- :source_id - :source_id
- :member_namespace_id
- :invite_email_success - :invite_email_success
- :state - :state
group_members: group_members:
......
...@@ -136,6 +136,7 @@ project_members: ...@@ -136,6 +136,7 @@ project_members:
- source - source
- project - project
- member_task - member_task
- member_namespace
merge_requests: merge_requests:
- status_check_responses - status_check_responses
- subscriptions - subscriptions
......
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