Commit Graph

9 Commits

Author SHA1 Message Date
GitLab Bot 6d59e98918 Add latest changes from gitlab-org/gitlab@master 2019-10-18 18:06:21 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
Reuben Pereira 414523b0bf Handle :9090 and 0.0.0.0:9090 listen_address formats
Prometheus listen_address can be in formats of :9090 and 0.0.0.0:9090.
But before these can be used to connect a project to Prometheus, they
have to converted into absolute URIs.
2019-09-02 14:35:02 +00:00
Lin Jen-Shin f6d3a47bde Merge branch '13806-fix' into 'master'
Add nil check for Gitlab.config.prometheus

Closes #13806

See merge request gitlab-org/gitlab-ce!32201
2019-08-27 10:45:27 +00:00
Reuben Pereira 7c9eb11149 Remove unnecessary include 2019-08-26 20:39:59 +00:00
rpereira2 b99cf2024d Add nil check for Gitlab.config.prometheus 2019-08-26 13:00:10 +05:30
Reuben Pereira 2515c0cd44 Add a link to docs in project description
Add to the service and migration both.
2019-08-23 22:27:41 +00:00
Ryan Cobb a0c16db70d Remove unnecessary rubocop disable 2019-07-09 17:02:08 -06:00
Ryan Cobb df8a56e630 Rename Gitlab::Importers module
In order to avoid confusion between Gitlab::Importers module and other
like named modules, this renamed it to Gitlab::DatabaseImporters.
2019-07-09 17:02:08 -06:00