diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-05-22 15:21:18 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-05-23 10:15:53 +0100 |
| commit | 49d7c4a89b1ad3fbfac4dcb79445c8e9e78bc25c (patch) | |
| tree | 51ea5709953e023bb59fdca0701f97d81a50d472 | |
| parent | d9734c258ca6f3f9588f1d85baa2e476cc443d6f (diff) | |
| download | gitlab-ce-49d7c4a89b1ad3fbfac4dcb79445c8e9e78bc25c.tar.gz | |
Merge branch 'sh-bump-prometheus-client-mmap' into 'master'
Bump prometheus-client-mmap to 0.9.3 to fix nil exception error
See merge request gitlab-org/gitlab-ce!19085
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-bump-prometheus-client-mmap.yml | 5 |
3 files changed, 17 insertions, 0 deletions
@@ -297,7 +297,11 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus +<<<<<<< HEAD gem 'prometheus-client-mmap', '~> 0.9.1' +======= + gem 'prometheus-client-mmap', '~> 0.9.3' +>>>>>>> b884cfc6c2... Merge branch 'sh-bump-prometheus-client-mmap' into 'master' gem 'raindrops', '~> 0.18' end diff --git a/Gemfile.lock b/Gemfile.lock index 2a63ee6a532..a34065a5fd2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -634,7 +634,11 @@ GEM parser unparser procto (0.0.3) +<<<<<<< HEAD prometheus-client-mmap (0.9.1) +======= + prometheus-client-mmap (0.9.3) +>>>>>>> b884cfc6c2... Merge branch 'sh-bump-prometheus-client-mmap' into 'master' pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -1133,7 +1137,11 @@ DEPENDENCIES peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) +<<<<<<< HEAD prometheus-client-mmap (~> 0.9.1) +======= + prometheus-client-mmap (~> 0.9.3) +>>>>>>> b884cfc6c2... Merge branch 'sh-bump-prometheus-client-mmap' into 'master' pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) diff --git a/changelogs/unreleased/sh-bump-prometheus-client-mmap.yml b/changelogs/unreleased/sh-bump-prometheus-client-mmap.yml new file mode 100644 index 00000000000..ea8bb0b365b --- /dev/null +++ b/changelogs/unreleased/sh-bump-prometheus-client-mmap.yml @@ -0,0 +1,5 @@ +--- +title: Bump prometheus-client-mmap to 0.9.3 to fix nil exception error +merge_request: +author: +type: fixed |