Marin Jankovski 7e26c59e89 Merge branch '10-5-update-dependencies-license-list' into 'master' ... 10.5 Update the dependencies license list See merge request gitlab-org/gitlab-ce!16998		2018-02-08 15:14:46 +00:00
..
assets
Dockerfile
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	Enable Prometheus metrics for deployed Ingresses	2018-02-05 12:46:31 +00: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