Kamil Trzciński 49b4187942 Merge branch '43189-deployed-ingress-configmap-does-not-enable-metrics' into 'master' ... Fully enable nginx-ingress metrics Closes #43189 See merge request gitlab-org/gitlab-ce!17069		2018-02-13 17:18:56 +00:00
..
Dockerfile	Ran bin/rake gitlab:update_templates	2017-12-13 04:41:28 +00:00
assets	Merge branch 'master' into jivl-update-katex	2018-02-12 12:48:31 -06:00
gitignore	10.5 Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates	2018-02-08 13:22:47 +00:00
gitlab-ci-yml	10.5 Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates	2018-02-08 13:22:47 +00:00
ingress	Properly format values.yaml for deployed Ingresses	2018-02-12 14:35:03 -05:00
project_templates	Bump import/export version in project templates	2018-01-06 09:35:34 +01:00
prometheus	Adapt config to support Prometheus 2.1	2018-02-05 12:44:15 +00:00
licenses.csv	10.5 Update the dependencies license list	2018-02-08 13:46:36 +00:00