summaryrefslogtreecommitdiff
path: root/fixtures/emojis/index.json
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-02-07 16:56:29 +0000
committerRobert Speicher <robert@gitlab.com>2018-02-07 16:56:29 +0000
commit1b748440c25619a2aaedef085e6f0aca26ef0d94 (patch)
treead343ebaec9bc236254fc7df2951670c69dc3f2c /fixtures/emojis/index.json
parentbb6895ec6cb60b8db6a615b12628685a088d1f1d (diff)
parent0e90284c11815f84c804e7e922e709b31ca6d029 (diff)
downloadgitlab-ce-1b748440c25619a2aaedef085e6f0aca26ef0d94.tar.gz
Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'
Deploy prometheus through kubernetes and autoconnect to cluster Closes #30480 and #28916 See merge request gitlab-org/gitlab-ce!16182
Diffstat (limited to 'fixtures/emojis/index.json')
0 files changed, 0 insertions, 0 deletions