diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-08-23 17:42:40 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-08-23 17:42:40 +0000 |
| commit | e84922906e51b22f2f335ebaa4390ccac2e4caf8 (patch) | |
| tree | d8e797d2dc04b62e005fa2276029b73dec5d9a04 /lib | |
| parent | 15ea614765ce88a93c91a3b055a7c4fb96fd1ccb (diff) | |
| parent | ebbd2aeb5f56bc2cacc5d95d41da370d8c29069d (diff) | |
| download | gitlab-ce-e84922906e51b22f2f335ebaa4390ccac2e4caf8.tar.gz | |
Merge branch 'jc-fix-auto-rugged-detection' into 'master'
Handle when server info doesn't have the storage in question
See merge request gitlab-org/gitlab-ce!32023
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/gitaly_client.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index e6cbfb00f60..201db9fec26 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -406,7 +406,8 @@ module Gitlab def self.filesystem_id(storage) response = Gitlab::GitalyClient::ServerService.new(storage).info storage_status = response.storage_statuses.find { |status| status.storage_name == storage } - storage_status.filesystem_id + + storage_status&.filesystem_id end def self.filesystem_id_from_disk(storage) |