1 files changed, 23 insertions, 5 deletions
diff --git a/app/controllers/concerns/wiki_actions.rb b/app/controllers/concerns/wiki_actions.rb
index 6abb2e16226..1ae90edd8f7 100644
--- a/app/controllers/concerns/wiki_actions.rb
+++ b/app/controllers/concerns/wiki_actions.rb
@@ -8,6 +8,8 @@ module WikiActions
   include RedisTracking
   extend ActiveSupport::Concern
 
+  RESCUE_GIT_TIMEOUTS_IN = %w[show edit history diff pages].freeze
+
   included do
     before_action { respond_to :html }
 
@@ -38,6 +40,12 @@ module WikiActions
       feature: :track_unique_wiki_page_views, feature_default_enabled: true
 
     helper_method :view_file_button, :diff_file_html_data
+
+    rescue_from ::Gitlab::Git::CommandTimedOut do |exc|
+      raise exc unless RESCUE_GIT_TIMEOUTS_IN.include?(action_name)
+
+      render 'shared/wikis/git_error'
+    end
   end
 
   def new
@@ -46,11 +54,7 @@ module WikiActions
 
   # rubocop:disable Gitlab/ModuleWithInstanceVariables
   def pages
-    @wiki_pages = Kaminari.paginate_array(
-      wiki.list_pages(sort: params[:sort], direction: params[:direction])
-    ).page(params[:page])
-
-    @wiki_entries = WikiDirectory.group_pages(@wiki_pages)
+    @wiki_entries = WikiDirectory.group_pages(wiki_pages)
 
     render 'shared/wikis/pages'
   end
@@ -182,6 +186,10 @@ module WikiActions
   end
   # rubocop:enable Gitlab/ModuleWithInstanceVariables
 
+  def git_access
+    render 'shared/wikis/git_access'
+  end
+
   private
 
   def container
@@ -225,9 +233,19 @@ module WikiActions
     unless @sidebar_page # Fallback to default sidebar
       @sidebar_wiki_entries, @sidebar_limited = wiki.sidebar_entries
     end
+  rescue ::Gitlab::Git::CommandTimedOut => e
+    @sidebar_error = e
   end
   # rubocop:enable Gitlab/ModuleWithInstanceVariables
 
+  def wiki_pages
+    strong_memoize(:wiki_pages) do
+      Kaminari.paginate_array(
+        wiki.list_pages(sort: params[:sort], direction: params[:direction])
+      ).page(params[:page])
+    end
+  end
+
   def wiki_params
     params.require(:wiki).permit(:title, :content, :format, :message, :last_commit_sha)
   end