Commit 17e23108 authored by Douwe Maan's avatar Douwe Maan

Add instructions to Google Code import page.

parent 7b5bc32c
...@@ -8,17 +8,17 @@ class Import::GoogleCodeController < Import::BaseController ...@@ -8,17 +8,17 @@ class Import::GoogleCodeController < Import::BaseController
dump_file = params[:dump_file] dump_file = params[:dump_file]
unless dump_file.respond_to?(:read) unless dump_file.respond_to?(:read)
return redirect_to :back, alert: "You need to upload a Google Takeout JSON file." return redirect_to :back, alert: "You need to upload a Google Takeout archive."
end end
begin begin
dump = JSON.parse(dump_file.read) dump = JSON.parse(dump_file.read)
rescue rescue
return redirect_to :back, alert: "The uploaded file is not a valid Google Takeout JSON file." return redirect_to :back, alert: "The uploaded file is not a valid Google Takeout archive."
end end
unless Gitlab::GoogleCodeImport::Client.new(dump).valid? unless Gitlab::GoogleCodeImport::Client.new(dump).valid?
return redirect_to :back, alert: "The uploaded file is not a valid Google Takeout JSON file." return redirect_to :back, alert: "The uploaded file is not a valid Google Takeout archive."
end end
session[:google_code_dump] = dump session[:google_code_dump] = dump
......
...@@ -4,14 +4,48 @@ ...@@ -4,14 +4,48 @@
%hr %hr
= form_tag callback_import_google_code_path, class: 'form-horizontal', multipart: true do = form_tag callback_import_google_code_path, class: 'form-horizontal', multipart: true do
%ul %p
Follow the steps below to export your Google Code project data.
In the next step, you'll be able to select the projects you want to import.
%ol
%li %li
Use Google Takeout etc %p
Go to
.form-group #{link_to "Google Takeout", "https://www.google.com/settings/takeout", target: "_blank"}.
= label_tag :dump_file, "Google Takeout JSON file", class: 'control-label' %li
.col-sm-10 %p
Make sure you're logged into the account that owns the projects you'd like to import.
%li
%p
Click the <strong>Select none</strong> button on the right, since we only need "Google Code Project Hosting".
%li
%p
Scroll down to <strong>Google Code Project Hosting</strong> and enable the switch on the right.
%li
%p
Choose <strong>Next</strong> at the bottom of the page.
%li
%p
Leave the "File type" and "Delivery method" options on their default values.
%li
%p
Choose <strong>Create archive</strong> and wait for archiving to complete.
%li
%p
Click the <strong>Download</strong> button and wait for downloading to complete.
%li
%p
Find the downloaded ZIP file and decompress it.
%li
%p
Find the newly extracted <code>Takeout/Google Code Project Hosting/GoogleCodeProjectHosting.json</code> file.
%li
%p
Upload <code>GoogleCodeProjectHosting.json</code> here:
%p
%input{type: "file", name: "dump_file", id: "dump_file"} %input{type: "file", name: "dump_file", id: "dump_file"}
%li
.form-actions %p
Continue to the next step:
%p
= submit_tag 'Select projects to import', class: "btn btn-create" = submit_tag 'Select projects to import', class: "btn btn-create"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment