Merge branch 'release/9.0.6'

gather-community · Feb 25, 2024 · 05c69ac · 05c69ac
2 parents 8892b93 + dbf9a3c
commit 05c69ac
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-9.0.5
+9.0.6
diff --git a/app/controllers/gdrive/migration/dashboard/files_controller.rb b/app/controllers/gdrive/migration/dashboard/files_controller.rb
@@ -4,7 +4,7 @@ module GDrive
   module Migration
     module Dashboard
       class FilesController < ApplicationController
-        before_action -> { nav_context(:wiki, :gdrive, :migration, :dashboard, :files) }
+        before_action -> { nav_context(:files, :gdrive, :migration, :dashboard, :files) }
 
         def index
           @main_config = MainConfig.find_by(community: current_community)

diff --git a/app/jobs/gdrive/migration/ingest_job.rb b/app/jobs/gdrive/migration/ingest_job.rb
@@ -70,6 +70,9 @@ def ingest_files
             migration_file = build_new_migration_file(file_id)
           end
 
+          # If still nil, it must be an invalid file so we skip.
+          next if migration_file.nil?
+
           begin
             # This could fail if
             # 1. the folder map for migration_file.parent_id is missing or invalid AND