diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-07 10:46:56 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-07 10:46:56 +0000 |
| commit | 37dd19935b7fe6942670de41d0da55e6c1d339d5 (patch) | |
| tree | b364b3a159e1d70f9a51849fce2a4dd9eb19d3ad /Gemfile.lock | |
| parent | 19982333d741119b395ef97fc3cdf7153313fad9 (diff) | |
| parent | 1c59ba67a539e9ef7298b1c219123200eeb54b01 (diff) | |
| download | gitlab-ce-37dd19935b7fe6942670de41d0da55e6c1d339d5.tar.gz | |
Merge branch 'instrument-infra' into 'master'
Add Prometheus metrics endpoint and basic infrastructure to meter code
See merge request !11553
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index be1f6555851..fe9d7a2b6f9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -457,6 +457,7 @@ GEM mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) + mmap2 (2.2.6) mousetrap-rails (1.4.6) multi_json (1.12.1) multi_xml (0.6.0) @@ -560,6 +561,8 @@ GEM premailer-rails (1.9.2) actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) + prometheus-client-mmap (0.7.0.beta5) + mmap2 (~> 2.2.6) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -995,6 +998,7 @@ DEPENDENCIES pg (~> 0.18.2) poltergeist (~> 1.9.0) premailer-rails (~> 1.9.0) + prometheus-client-mmap (~> 0.7.0.beta5) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) |