diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-25 17:44:08 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-08-25 17:44:08 +0000 |
| commit | 532489dc045d6f0c6a215889be3f1d39097d1c83 (patch) | |
| tree | 95ad94c860fea9ae38395b4dcced1d0650c7a77b /lib/api/entities.rb | |
| parent | b099a10e8595a517a401c9e9d2a3962f96578081 (diff) | |
| parent | fc3dfb61b7f0dd7975f04cc068ff3e26c3a8b947 (diff) | |
| download | gitlab-ce-532489dc045d6f0c6a215889be3f1d39097d1c83.tar.gz | |
Merge branch '21378-error-500-after-8-11-update-on-system-infos-page' into 'master'
Handle unavailable system info
## What does this MR do?
Handle the case where we can't get system info without blowing up. As this is the first tab in the monitoring section, it's difficult to get to the other tabs if this page throws a 500. Also be more specific about the info we want, so we don't fail on something we don't care about (like `/proc/net/dev`).
## Why was this MR needed?
grsecurity can prevent users from reading `/proc`, which is what Vmstat uses to find CPU and memory info.
## What are the relevant issue numbers?
Closes #21378.
See merge request !5989
Diffstat (limited to 'lib/api/entities.rb')
0 files changed, 0 insertions, 0 deletions