Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
3bb3a688
Commit
3bb3a688
authored
Apr 04, 2017
by
James Edwards-Jones
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Attempt to fix import/export of push_access_levels for protected tags
parent
1e15444a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
1 deletion
+9
-1
lib/gitlab/import_export/import_export.yml
lib/gitlab/import_export/import_export.yml
+2
-0
lib/gitlab/import_export/relation_factory.rb
lib/gitlab/import_export/relation_factory.rb
+2
-1
spec/lib/gitlab/import_export/all_models.yml
spec/lib/gitlab/import_export/all_models.yml
+5
-0
No files found.
lib/gitlab/import_export/import_export.yml
View file @
3bb3a688
...
@@ -46,6 +46,8 @@ project_tree:
...
@@ -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.
...
...
lib/gitlab/import_export/relation_factory.rb
View file @
3bb3a688
...
@@ -7,8 +7,9 @@ module Gitlab
...
@@ -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
...
...
spec/lib/gitlab/import_export/all_models.yml
View file @
3bb3a688
...
@@ -111,10 +111,14 @@ protected_branches:
...
@@ -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:
...
@@ -169,6 +173,7 @@ project:
-
snippets
-
snippets
-
hooks
-
hooks
-
protected_branches
-
protected_branches
-
protected_tags
-
project_members
-
project_members
-
users
-
users
-
requesters
-
requesters
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment