Commit Graph

20 Commits

Author SHA1 Message Date
GitLab Bot 5ee120f467 Add latest changes from gitlab-org/gitlab@master 2020-02-18 03:08:54 +00:00
GitLab Bot 1078b7bf25 Add latest changes from gitlab-org/gitlab@master 2020-02-11 09:08:39 +00:00
GitLab Bot d87918510a Add latest changes from gitlab-org/gitlab@master 2020-02-06 09:09:06 +00:00
GitLab Bot fedf978f9a Add latest changes from gitlab-org/gitlab@master 2020-01-28 15:08:36 +00:00
GitLab Bot d47f9d2304 Add latest changes from gitlab-org/gitlab@master 2020-01-16 15:08:41 +00:00
GitLab Bot b0f27742e7 Add latest changes from gitlab-org/gitlab@master 2020-01-16 00:08:32 +00:00
GitLab Bot e0b84f4ba4 Add latest changes from gitlab-org/gitlab@master 2020-01-08 21:08:08 +00:00
GitLab Bot 05f1d5d981 Add latest changes from gitlab-org/gitlab@master 2020-01-07 12:07:55 +00:00
GitLab Bot 68b6846fa6 Add latest changes from gitlab-org/gitlab@master 2019-11-22 15:06:39 +00:00
GitLab Bot 4c464055fb Add latest changes from gitlab-org/gitlab@master 2019-11-05 15:06:17 +00:00
Grzegorz Bizon 1068ec2e92 Merge branch '66741-remove-spec-rails_helper-rb' into 'master'
Remove spec/rails_helper.rb

Closes #66741

See merge request gitlab-org/gitlab-ce!32380
2019-09-03 13:48:17 +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
Ash McKenzie 19ff9d9899
Replace rails_helper.rb with spec_helper.rb
rails_helper.rb's only logic was to require
spec_helper.rb.
2019-08-30 12:26:18 +10:00
Robert Speicher 7698d40550
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2019-08-29 17:17:37 -05:00
rpereira2 b99cf2024d Add nil check for Gitlab.config.prometheus 2019-08-26 13:00:10 +05:30
Brett Walker 17c312d601 Fix failing spec due to changes UpdateService
for ApplicationSettings
2019-08-23 23:44:53 -05:00
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
Peter Leitzen 163a43629c Prefer `flat_map` over `map` + `flatten` in specs
Although `flat_map` is equivalent to `map` + `flatten(1)`
(note the level 1) we can apply this same refactoring to all cases.
2019-07-24 08:19:15 +00:00
Ryan Cobb 468b806902 Remove unnecessary let in spec 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