From 57deb3306be92d3b08a1697bbc3f6096923c6d0b Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <heinrich@gitlab.com>
Date: Sun, 5 Apr 2020 18:31:37 +0800
Subject: [PATCH] Use upstream derailed_benchmarks gem
We don't need our custom fork anymore since the PR has been
accepted upstream
---
Gemfile | 2 +-
Gemfile.lock | 28 +++++++++++++++++-----------
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/Gemfile b/Gemfile
index 7e4a65476b1b..906709656f39 100644
--- a/Gemfile
+++ b/Gemfile
@@ -319,7 +319,7 @@ gem 'peek', '~> 1.1'
gem 'snowplow-tracker', '~> 0.6.1'
# Memory benchmarks
-gem 'gitlab-derailed_benchmarks', require: false
+gem 'derailed_benchmarks', require: false
# Metrics
group :metrics do
diff --git a/Gemfile.lock b/Gemfile.lock
index 7cd5be09e68d..c65e2252ce65 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -211,6 +211,17 @@ GEM
declarative-option (0.1.0)
default_value_for (3.3.0)
activerecord (>= 3.2.0, < 6.1)
+ derailed_benchmarks (1.7.0)
+ benchmark-ips (~> 2)
+ get_process_mem (~> 0)
+ heapy (~> 0)
+ memory_profiler (~> 0)
+ mini_histogram (~> 0)
+ rack (>= 1)
+ rake (> 10, < 14)
+ ruby-statistics (>= 2.1)
+ thor (>= 0.19, < 2)
+ unicode_plot (>= 0.0.4, < 1.0.0)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
device_detector (1.0.0)
@@ -259,6 +270,7 @@ GEM
launchy (~> 2.1)
mail (~> 2.7)
encryptor (3.0.0)
+ enumerable-statistics (2.0.1)
equalizer (0.0.11)
erubi (1.9.0)
escape_utils (1.2.1)
@@ -290,7 +302,7 @@ GEM
fast_blank (1.0.0)
fast_gettext (1.6.0)
ffaker (2.10.0)
- ffi (1.11.3)
+ ffi (1.12.2)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
@@ -371,15 +383,6 @@ GEM
github-markup (1.7.0)
gitlab-chronic (0.10.5)
numerizer (~> 0.2)
- gitlab-derailed_benchmarks (1.6.1)
- benchmark-ips (~> 2)
- get_process_mem (~> 0)
- heapy (~> 0)
- memory_profiler (~> 0)
- rack (>= 1)
- rake (> 10, < 14)
- ruby-statistics (>= 2.1)
- thor (>= 0.19, < 2)
gitlab-labkit (0.12.0)
actionpack (>= 5.0.0, < 6.1.0)
activesupport (>= 5.0.0, < 6.1.0)
@@ -632,6 +635,7 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0331)
mimemagic (0.3.3)
+ mini_histogram (0.1.3)
mini_magick (4.9.5)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
@@ -1084,6 +1088,8 @@ GEM
unf_ext
unf_ext (0.0.7.5)
unicode-display_width (1.6.0)
+ unicode_plot (0.0.4)
+ enumerable-statistics (>= 2.0.1)
unicode_utils (1.4.0)
unicorn (5.4.1)
kgio (~> 2.6)
@@ -1189,6 +1195,7 @@ DEPENDENCIES
database_cleaner (~> 1.7.0)
deckar01-task_list (= 2.3.1)
default_value_for (~> 3.3.0)
+ derailed_benchmarks
device_detector
devise (~> 4.6)
devise-two-factor (~> 3.1.0)
@@ -1231,7 +1238,6 @@ DEPENDENCIES
gitaly (~> 12.9.0.pre.rc4)
github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5)
- gitlab-derailed_benchmarks
gitlab-labkit (= 0.12.0)
gitlab-license (~> 1.0)
gitlab-mail_room (~> 0.0.3)
--
GitLab