diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-06-30 12:56:59 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-06-30 12:56:59 +0000 |
| commit | 1c2e7af6afa4be48c4d95e3b5de8005746db9bc7 (patch) | |
| tree | f5f5a66a243aad501ad8715a021c161b50005013 /Gemfile.lock | |
| parent | 8b675291821455d755fdeef7b2bdd0c99ce0f32f (diff) | |
| parent | 98238a27c7b0e5d4c7a674a78c859150966e6f8b (diff) | |
| download | gitlab-ce-1c2e7af6afa4be48c4d95e3b5de8005746db9bc7.tar.gz | |
Merge branch 'issue-18886' into 'master'
Loop all disks when displaying system info. Closes #18886
See merge request !4983
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 352940cc75d..f99b373dbbd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -715,6 +715,8 @@ GEM activerecord (>= 4.1, < 5.1) state_machines-activemodel (>= 0.3.0) stringex (2.5.2) + sys-filesystem (1.1.6) + ffi systemu (2.6.5) task_list (1.0.2) html-pipeline @@ -966,6 +968,7 @@ DEPENDENCIES spring-commands-teaspoon (~> 0.0.2) sprockets (~> 3.6.0) state_machines-activerecord (~> 0.4.0) + sys-filesystem (~> 1.1.6) task_list (~> 1.0.2) teaspoon (~> 1.1.0) teaspoon-jasmine (~> 2.2.0) |