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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
6b6706f8
Commit
6b6706f8
authored
May 12, 2020
by
Aleksei Lipniagov
Committed by
Qingyu Zhao
May 13, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move protected_environments to proper fixture file
`protected_environments` should be located in designs fixture file
parent
0eabe7e4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
17 deletions
+23
-17
ee/spec/lib/ee/gitlab/import_export/project/tree_restorer_spec.rb
...lib/ee/gitlab/import_export/project/tree_restorer_spec.rb
+1
-1
spec/fixtures/lib/gitlab/import_export/complex/project.json
spec/fixtures/lib/gitlab/import_export/complex/project.json
+20
-0
spec/fixtures/lib/gitlab/import_export/complex/tree/project/protected_environments.ndjson
...export/complex/tree/project/protected_environments.ndjson
+1
-0
spec/fixtures/lib/gitlab/import_export/designs/project.json
spec/fixtures/lib/gitlab/import_export/designs/project.json
+1
-16
No files found.
ee/spec/lib/ee/gitlab/import_export/project/tree_restorer_spec.rb
View file @
6b6706f8
...
...
@@ -81,7 +81,7 @@ describe Gitlab::ImportExport::Project::TreeRestorer do
end
before
do
setup_import_export_config
(
'
designs
'
)
setup_import_export_config
(
'
complex
'
)
restored_project_json
end
...
...
spec/fixtures/lib/gitlab/import_export/complex/project.json
View file @
6b6706f8
...
...
@@ -7444,6 +7444,26 @@
]
}
],
"protected_environments"
:
[
{
"id"
:
1
,
"project_id"
:
9
,
"created_at"
:
"2017-10-19T15:36:23.466Z"
,
"updated_at"
:
"2017-10-19T15:36:23.466Z"
,
"name"
:
"production"
,
"deploy_access_levels"
:
[
{
"id"
:
1
,
"protected_environment_id"
:
1
,
"created_at"
:
"2017-10-19T15:36:23.466Z"
,
"updated_at"
:
"2017-10-19T15:36:23.466Z"
,
"access_level"
:
40
,
"user_id"
:
1
,
"group_id"
:
null
}
]
}
],
"protected_tags"
:
[
{
"id"
:
1
,
...
...
spec/fixtures/lib/gitlab/import_export/complex/tree/project/protected_environments.ndjson
0 → 100644
View file @
6b6706f8
{ "id": 1, "project_id": 9, "created_at": "2017-10-19T15:36:23.466Z", "updated_at": "2017-10-19T15:36:23.466Z", "name": "production", "deploy_access_levels": [ { "id": 1, "protected_environment_id": 1, "created_at": "2017-10-19T15:36:23.466Z", "updated_at": "2017-10-19T15:36:23.466Z", "access_level": 40, "user_id": 1, "group_id": null } ] }
spec/fixtures/lib/gitlab/import_export/designs/project.json
View file @
6b6706f8
...
...
@@ -463,22 +463,7 @@
],
"protected_environments"
:
[
{
"id"
:
14
,
"created_at"
:
"2017-10-19T15:36:23.466Z"
,
"updated_at"
:
"2017-10-19T15:36:23.466Z"
,
"name"
:
"production"
,
"deploy_access_levels"
:
[
{
"id"
:
21
,
"created_at"
:
"2017-10-19T15:36:23.466Z"
,
"updated_at"
:
"2017-10-19T15:36:23.466Z"
,
"access_level"
:
40
,
"user_id"
:
1
,
"group_id"
:
null
}
]
}
],
"protected_tags"
:[
...
...
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