Attempt to fix import/export of push_access_levels for protected tags

This commit is contained in:
James Edwards-Jones 2017-04-04 02:19:04 +01:00
parent 1e15444ae6
commit 3bb3a6886f
3 changed files with 9 additions and 1 deletions

View File

@ -46,6 +46,8 @@ project_tree:
- protected_branches: - protected_branches:
- :merge_access_levels - :merge_access_levels
- :push_access_levels - :push_access_levels
- protected_tags:
- :push_access_levels
- :project_feature - :project_feature
# Only include the following attributes for the models specified. # Only include the following attributes for the models specified.

View File

@ -7,8 +7,9 @@ module Gitlab
triggers: 'Ci::Trigger', triggers: 'Ci::Trigger',
builds: 'Ci::Build', builds: 'Ci::Build',
hooks: 'ProjectHook', hooks: 'ProjectHook',
merge_access_levels: 'ProtectedBranch::MergeAccessLevel', #TODO: Tags merge_access_levels: 'ProtectedBranch::MergeAccessLevel',
push_access_levels: 'ProtectedBranch::PushAccessLevel', push_access_levels: 'ProtectedBranch::PushAccessLevel',
#TODO: How to add?- push_access_levels: 'ProtectedTag::PushAccessLevel',
labels: :project_labels, labels: :project_labels,
priorities: :label_priorities, priorities: :label_priorities,
label: :project_label }.freeze label: :project_label }.freeze

View File

@ -111,10 +111,14 @@ protected_branches:
- project - project
- merge_access_levels - merge_access_levels
- push_access_levels - push_access_levels
protected_tags:
- project
- push_access_levels
merge_access_levels: merge_access_levels:
- protected_branch - protected_branch
push_access_levels: push_access_levels:
- protected_branch - protected_branch
- protected_tag
project: project:
- taggings - taggings
- base_tags - base_tags
@ -169,6 +173,7 @@ project:
- snippets - snippets
- hooks - hooks
- protected_branches - protected_branches
- protected_tags
- project_members - project_members
- users - users
- requesters - requesters