diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-05-29 14:19:43 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-02 19:45:58 +0200 |
| commit | c134a72cdb7e6de8b70dc60de99cf4edc68a9227 (patch) | |
| tree | 0082ba4d422cc53eea223583bca9c98cbc823c96 /Gemfile.lock | |
| parent | 770f07cd5c68075bb261f4b6139c92b2ac9309c0 (diff) | |
| download | gitlab-ce-c134a72cdb7e6de8b70dc60de99cf4edc68a9227.tar.gz | |
Move Prometheus presentation logic to PrometheusText
+ Use NullMetrics to mock metrics when unused
+ Use method_missing in NullMetrics mocking
+ Update prometheus gem to version that correctly uses transitive dependencies
+ Ensure correct folders are used in Multiprocess prometheus client tests.
+ rename Sessions controller's metric
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bb574ae1834..12520570dfe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -561,8 +561,8 @@ GEM premailer-rails (1.9.2) actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) - prometheus-client-mmap (0.7.0.beta3) - quantile (~> 0.2.0) + prometheus-client-mmap (0.7.0.beta5) + mmap2 (~> 2.2.6) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -573,7 +573,6 @@ GEM pry-rails (0.3.5) pry (>= 0.9.10) pyu-ruby-sasl (0.0.3.3) - quantile (0.2.0) rack (1.6.5) rack-accept (0.4.5) rack (>= 0.4) @@ -972,7 +971,6 @@ DEPENDENCIES mail_room (~> 0.9.1) method_source (~> 0.8) minitest (~> 5.7.0) - mmap2 (~> 2.2.6) mousetrap-rails (~> 1.4.6) mysql2 (~> 0.3.16) net-ssh (~> 3.0.1) @@ -1000,7 +998,7 @@ DEPENDENCIES pg (~> 0.18.2) poltergeist (~> 1.9.0) premailer-rails (~> 1.9.0) - prometheus-client-mmap (~> 0.7.0.beta3) + prometheus-client-mmap (~> 0.7.0.beta5) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) |