Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
This commit is contained in:
commit
bd5b019a7c
3 changed files with 7 additions and 2 deletions
|
@ -23,5 +23,9 @@ module Gitlab
|
|||
def version_filename
|
||||
'VERSION'
|
||||
end
|
||||
|
||||
def version
|
||||
VERSION
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -10,7 +10,6 @@ module Gitlab
|
|||
end
|
||||
|
||||
def save
|
||||
FileUtils.mkdir_p(@shared.export_path)
|
||||
File.write(full_path, project_json_tree)
|
||||
true
|
||||
rescue => e
|
||||
|
|
|
@ -11,8 +11,10 @@ module Gitlab
|
|||
end
|
||||
|
||||
def save
|
||||
FileUtils.mkdir_p(@shared.export_path)
|
||||
|
||||
File.open(version_file, 'w') do |file|
|
||||
file.write(Gitlab::ImportExport.VERSION)
|
||||
file.write(Gitlab::ImportExport.version)
|
||||
end
|
||||
rescue => e
|
||||
@shared.error(e)
|
||||
|
|
Loading…
Reference in a new issue