diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-05 12:46:38 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-05 12:46:38 +0000 |
| commit | 518c9628a3c15920f7e92df3099f3827bee3aa5c (patch) | |
| tree | 3f3e86a0b1154ca2e7c0b2f393871bfbe2c4b56c /lib/api/files.rb | |
| parent | 1e66ff6d8003abeab261c90fc94d8fcb4d93083d (diff) | |
| parent | 0cad8d6437a0c418f4fa9c42315c981fa6a4006c (diff) | |
| download | gitlab-ce-518c9628a3c15920f7e92df3099f3827bee3aa5c.tar.gz | |
Merge branch '42496-prometheus-deployment-fails-after-helm-chart-upgrade-to-2-1' into 'master'
Adapt config to support Prometheus 2.1
Closes #42496 and #42498
See merge request gitlab-org/gitlab-ce!16749
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions