diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-15 03:11:37 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-15 03:11:37 +0000 |
| commit | aa9f2954530d4b43a4e3b190b7769fe5b6b6a64e (patch) | |
| tree | 4f6f50b00030f7edc01a7ad23f5744a1abcde0aa /Gemfile.lock | |
| parent | 38b948a54e00841b51c446beb0adf079af60c963 (diff) | |
| download | gitlab-ce-aa9f2954530d4b43a4e3b190b7769fe5b6b6a64e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a24e2877d55..33cf0d9dae9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -219,8 +219,8 @@ GEM benchmark (0.2.0) benchmark-ips (2.3.0) benchmark-malloc (0.2.0) - benchmark-memory (0.1.2) - memory_profiler (~> 0.9) + benchmark-memory (0.2.0) + memory_profiler (~> 1) benchmark-perf (0.6.0) benchmark-trend (0.4.0) better_errors (2.9.1) @@ -330,7 +330,7 @@ GEM activerecord (>= 3.2.0, < 7.0) deprecation_toolkit (1.5.1) activesupport (>= 4.2) - derailed_benchmarks (2.1.1) + derailed_benchmarks (2.1.2) benchmark-ips (~> 2) dead_end get_process_mem (~> 0) @@ -892,7 +892,7 @@ GEM actionpack (>= 5.2) activerecord (>= 5.2) memoist (0.16.2) - memory_profiler (0.9.14) + memory_profiler (1.0.1) method_source (1.0.0) mime-types (3.4.1) mime-types-data (~> 3.2015) @@ -1727,7 +1727,7 @@ DEPENDENCIES mail (= 2.7.1) mail-smtp_pool (~> 0.1.0)! marginalia (~> 1.11.1) - memory_profiler (~> 0.9) + memory_profiler (~> 1.0) microsoft_graph_mailer (~> 0.1.0)! mini_magick (~> 4.10.1) minitest (~> 5.11.0) |