diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-07-30 15:32:59 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-07-30 15:32:59 +0000 |
| commit | d92a8c1a5f9b061a10140239bed44b432b28abdf (patch) | |
| tree | 4fcac30dba9434552377f729d4be7ad31fb22f99 /lib | |
| parent | ab509c78929d9b5f4e02d013e8911ac9d0a07aad (diff) | |
| parent | 3b76d2982f2fdacdce5842c68ab3ba68b6cb7842 (diff) | |
| download | gitlab-ce-d92a8c1a5f9b061a10140239bed44b432b28abdf.tar.gz | |
Merge branch 'sh-fix-gitaly-access-control' into 'master'
Fix exception handling in Gitaly autodetection
Closes #65328
See merge request gitlab-org/gitlab-ce!31285
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/gitaly_client.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index c98de722fe1..4783832961d 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -413,7 +413,7 @@ module Gitlab metadata_file = File.read(storage_metadata_file_path(storage)) metadata_hash = JSON.parse(metadata_file) metadata_hash['gitaly_filesystem_id'] - rescue Errno::ENOENT, Errno::ACCESS, JSON::ParserError + rescue Errno::ENOENT, Errno::EACCES, JSON::ParserError nil end |