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
Tatuya Kamada
gitlab-ce
Commits
eeb13c16
Commit
eeb13c16
authored
Jan 25, 2017
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename method and added note to export file spec about new encrypted attributes
parent
bb220126
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
lib/gitlab/import_export/relation_factory.rb
lib/gitlab/import_export/relation_factory.rb
+2
-2
spec/features/projects/import_export/export_file_spec.rb
spec/features/projects/import_export/export_file_spec.rb
+3
-0
No files found.
lib/gitlab/import_export/relation_factory.rb
View file @
eeb13c16
...
...
@@ -62,7 +62,7 @@ module Gitlab
update_project_references
handle_group_label
if
group_label?
reset_
ci_
tokens!
reset_tokens!
@relation_hash
[
'data'
].
deep_symbolize_keys!
if
@relation_name
==
:events
&&
@relation_hash
[
'data'
]
set_st_diffs
if
@relation_name
==
:merge_request_diff
...
...
@@ -142,7 +142,7 @@ module Gitlab
end
end
def
reset_
ci_
tokens!
def
reset_tokens!
return
unless
Gitlab
::
ImportExport
.
reset_tokens?
&&
TOKEN_RESET_MODELS
.
include?
(
@relation_name
.
to_s
)
# If we import/export a project to the same instance, tokens will have to be reset.
...
...
spec/features/projects/import_export/export_file_spec.rb
View file @
eeb13c16
...
...
@@ -74,6 +74,9 @@ feature 'Import/Export - project export integration test', feature: true, js: tr
Otherwise, please add the exception to +safe_list+ in CURRENT_SPEC using
#{
sensitive_word
}
as the key and the
correspondent hash or model as the value.
Also, if the attribute is encrypted, please add it to either the list of excluded attributes in IMPORT_EXPORT_CONFIG
or the model to RelationFactory::TOKEN_RESET_MODELS if it includes a token that can be reset.
IMPORT_EXPORT_CONFIG:
#{
Gitlab
::
ImportExport
.
config_file
}
CURRENT_SPEC:
#{
__FILE__
}
MSG
...
...
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