Add latest changes from gitlab-org/gitlab@master

2 files changed, 22 insertions, 14 deletions

diff --git a/lib/gitlab/gitaly_client/blob_service.rb b/lib/gitlab/gitaly_client/blob_service.rb
index 669fb1c0a31..19a473e4785 100644
--- a/lib/gitlab/gitaly_client/blob_service.rb
+++ b/lib/gitlab/gitaly_client/blob_service.rb
@@ -98,11 +98,12 @@ module Gitlab
       end
 
       def get_all_lfs_pointers
-        request = Gitaly::GetAllLFSPointersRequest.new(
-          repository: @gitaly_repo
+        request = Gitaly::ListLFSPointersRequest.new(
+          repository: @gitaly_repo,
+          revisions: [encode_binary("--all")]
         )
 
-        response = GitalyClient.call(@gitaly_repo.storage_name, :blob_service, :get_all_lfs_pointers, request, timeout: GitalyClient.medium_timeout)
+        response = GitalyClient.call(@gitaly_repo.storage_name, :blob_service, :list_lfs_pointers, request, timeout: GitalyClient.medium_timeout)
         map_lfs_pointers(response)
       end
 
@@ -125,19 +126,20 @@ module Gitlab
 
           [request, :list_all_lfs_pointers]
         else
-          request = Gitaly::GetNewLFSPointersRequest.new(
+          revisions = [revision]
+          revisions += if not_in.nil? || not_in == :all
+                         ["--not", "--all"]
+                       else
+                         not_in.prepend "--not"
+                       end
+
+          request = Gitaly::ListLFSPointersRequest.new(
             repository: @gitaly_repo,
-            revision: encode_binary(revision),
-            limit: limit || 0
+            limit: limit || 0,
+            revisions: revisions.map { |rev| encode_binary(rev) }
           )
 
-          if not_in.nil? || not_in == :all
-            request.not_in_all = true
-          else
-            request.not_in_refs += not_in
-          end
-
-          [request, :get_new_lfs_pointers]
+          [request, :list_lfs_pointers]
         end
       end
 
diff --git a/lib/gitlab/pages/settings.rb b/lib/gitlab/pages/settings.rb
index 0e77259a0de..be71018e851 100644
--- a/lib/gitlab/pages/settings.rb
+++ b/lib/gitlab/pages/settings.rb
@@ -6,7 +6,7 @@ module Gitlab
       DiskAccessDenied = Class.new(StandardError)
 
       def path
-        ::Gitlab::ErrorTracking.track_exception(DiskAccessDenied.new) if disk_access_denied?
+        report_denied_disk_access
 
         super
       end
@@ -22,6 +22,12 @@ module Gitlab
 
         ::Gitlab::Runtime.web_server? && !::Gitlab::Runtime.test_suite?
       end
+
+      def report_denied_disk_access
+        raise DiskAccessDenied if disk_access_denied?
+      rescue => e
+        ::Gitlab::ErrorTracking.track_exception(e)
+      end
     end
   end
 end