diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-05-27 08:30:18 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-05-27 08:30:18 +0000 |
| commit | 5610a3bd45104c1f5ce051bb367281886ffea355 (patch) | |
| tree | 8197293479ffaf0300f6cb530183783c8c0678ab | |
| parent | 211dff18e1ae14f37b9af81aa645a457def1abd1 (diff) | |
| parent | 937fae76cb17a3e9129173729a8463fa5b837f0d (diff) | |
| download | gitlab-ce-5610a3bd45104c1f5ce051bb367281886ffea355.tar.gz | |
Merge branch 'ashmckenzie/add-benchmark-memory' into 'master'
Add benchmark-memory Ruby gem
See merge request gitlab-org/gitlab-ce!28762
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 5 |
2 files changed, 6 insertions, 2 deletions
@@ -400,7 +400,8 @@ gem 'html2text' gem 'ruby-prof', '~> 0.17.0' gem 'rbtrace', '~> 0.4', require: false -gem 'memory_profiler', require: false +gem 'memory_profiler', '~> 0.9', require: false +gem 'benchmark-memory', '~> 0.1', require: false # OAuth gem 'oauth2', '~> 1.4' diff --git a/Gemfile.lock b/Gemfile.lock index 9a2411713c0..9e922d8a3bb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -82,6 +82,8 @@ GEM bcrypt (3.1.12) bcrypt_pbkdf (1.0.0) benchmark-ips (2.3.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) better_errors (2.5.0) coderay (>= 1.0.0) erubi (>= 1.0.0) @@ -1024,6 +1026,7 @@ DEPENDENCIES batch-loader (~> 1.4.0) bcrypt_pbkdf (~> 1.0) benchmark-ips (~> 2.3.0) + benchmark-memory (~> 0.1) better_errors (~> 2.5.0) binding_of_caller (~> 0.8.0) bootsnap (~> 1.4) @@ -1122,7 +1125,7 @@ DEPENDENCIES lograge (~> 0.5) loofah (~> 2.2) mail_room (~> 0.9.1) - memory_profiler + memory_profiler (~> 0.9) method_source (~> 0.8) mimemagic (~> 0.3.2) mini_magick |