Add latest changes from gitlab-org/gitlab@13-0-stable-ee

2 files changed, 3 insertions, 3 deletions

diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb
index 34af1ecd6a5..4e8ceae75bd 100644
--- a/app/controllers/import/github_controller.rb
+++ b/app/controllers/import/github_controller.rb
@@ -144,7 +144,7 @@ class Import::GithubController < Import::BaseController
   end
 
   def provider_rate_limit(exception)
-    reset_time = Time.at(exception.response_headers['x-ratelimit-reset'].to_i)
+    reset_time = Time.zone.at(exception.response_headers['x-ratelimit-reset'].to_i)
     session[access_token_key] = nil
     redirect_to new_import_url,
       alert: _("GitHub API rate limit exceeded. Try again after %{reset_time}") % { reset_time: reset_time }
diff --git a/app/controllers/import/google_code_controller.rb b/app/controllers/import/google_code_controller.rb
index 4dddfbcd20d..03bde0345e3 100644
--- a/app/controllers/import/google_code_controller.rb
+++ b/app/controllers/import/google_code_controller.rb
@@ -15,7 +15,7 @@ class Import::GoogleCodeController < Import::BaseController
     end
 
     begin
-      dump = JSON.parse(dump_file.read)
+      dump = Gitlab::Json.parse(dump_file.read)
     rescue
       return redirect_back_or_default(options: { alert: _("The uploaded file is not a valid Google Takeout archive.") })
     end
@@ -42,7 +42,7 @@ class Import::GoogleCodeController < Import::BaseController
     user_map_json = "{}" if user_map_json.blank?
 
     begin
-      user_map = JSON.parse(user_map_json)
+      user_map = Gitlab::Json.parse(user_map_json)
     rescue
       flash.now[:alert] = _("The entered user map is not a valid JSON user map.")