Kamil Trzciński 0f449ecc37 Merge branch '41796-update-auto-deployed-prometheus-scrape-config' into 'master' ... Update auto-deployed prometheus scrape config Closes #41796 See merge request gitlab-org/gitlab-ce!16306		2018-01-16 15:12:43 +00:00
..
Dockerfile	Ran bin/rake gitlab:update_templates	2017-12-13 04:41:28 +00:00
assets	remove vendored clipboard library in favor of package.json entry	2017-11-28 15:34:14 -06:00
gitignore	Update templates for 10.4	2018-01-06 14:58:42 +00:00
gitlab-ci-yml	Update AutoDevOps template with browser performance fix	2018-01-10 17:28:50 -05:00
project_templates	Bump import/export version in project templates	2018-01-06 09:35:34 +01:00
prometheus	Update prometheus.yml to reflect current Omnibus version	2018-01-15 10:36:13 -06:00
licenses.csv	Update licenses for 10.4	2018-01-06 23:53:08 +00:00