Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-06-30 15:56:59 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-06-30 15:56:59 +0300
commit1c2e7af6afa4be48c4d95e3b5de8005746db9bc7 (patch)
treef5f5a66a243aad501ad8715a021c161b50005013 /config
parent8b675291821455d755fdeef7b2bdd0c99ce0f32f (diff)
parent98238a27c7b0e5d4c7a674a78c859150966e6f8b (diff)
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.yml6
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