diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-20 09:32:04 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-20 09:32:04 +0000 |
| commit | 4f40560836be0f66fbfb69d9e5af2755da8e9ebb (patch) | |
| tree | eac5fbd5d6b08a6a81418ea522980f0999fcd2c2 | |
| parent | 12cd4c83604e43dc308ba13fa3d5a6571409c1f8 (diff) | |
| parent | d3afb752385e41bed583391b678cb0e49e5a04cc (diff) | |
| download | gitlab-ce-4f40560836be0f66fbfb69d9e5af2755da8e9ebb.tar.gz | |
Merge branch 'patch-13' into 'master'
exclude rpc_pipefs from system disk info
See merge request !9355
| -rw-r--r-- | app/controllers/admin/system_info_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/system_info_controller.rb b/app/controllers/admin/system_info_controller.rb index ca04a17caa1..1330399a836 100644 --- a/app/controllers/admin/system_info_controller.rb +++ b/app/controllers/admin/system_info_controller.rb @@ -21,6 +21,7 @@ class Admin::SystemInfoController < Admin::ApplicationController 'mqueue', 'proc', 'pstore', + 'rpc_pipefs', 'securityfs', 'sysfs', 'tmpfs', |