diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-04-03 17:02:39 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-04-03 17:02:39 +0300 |
commit | 17e23108788b4407dba4480f7b2e96013e023b32 (patch) | |
tree | 203a28af980afb0ebc84b040dc6d79f66aee3838 /app/controllers/import | |
parent | 7b5bc32cadbf2c0a3ac1e80643e46786fd8b1b56 (diff) |
Add instructions to Google Code import page.
Diffstat (limited to 'app/controllers/import')
-rw-r--r-- | app/controllers/import/google_code_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/import/google_code_controller.rb b/app/controllers/import/google_code_controller.rb index 9542a33193a..9bf29386bc9 100644 --- a/app/controllers/import/google_code_controller.rb +++ b/app/controllers/import/google_code_controller.rb @@ -8,17 +8,17 @@ class Import::GoogleCodeController < Import::BaseController dump_file = params[:dump_file] 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 begin dump = JSON.parse(dump_file.read) 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 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 session[:google_code_dump] = dump |