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 /config | |
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 'config')
-rw-r--r-- | config/dependency_decisions.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index 436a2c5e17a..293f2b71d65 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -181,3 +181,9 @@ :why: Equivalent to LGPLv2 :versions: [] :when: 2016-06-07 17:14:10.907682000 Z +- - :whitelist + - Artistic 2.0 + - :who: Josh Frye + :why: Disk/mount information display on Admin pages + :versions: [] + :when: 2016-06-29 16:32:45.432113000 Z |