Merge branch 'add-mem-profiler' into 'master'

Add `memory_profiler` and `derailed_benchmarks`

See merge request gitlab-org/gitlab-ce!28698

2 files changed, 14 insertions, 0 deletions

diff --git a/Gemfile b/Gemfile
index e2842ca27db..09be52a64e1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -372,6 +372,7 @@ group :development, :test do
   gem 'activerecord_sane_schema_dumper', '1.0'
 
   gem 'stackprof', '~> 0.2.10', require: false
+  gem 'derailed_benchmarks', require: false
 
   gem 'simple_po_parser', '~> 1.1.2', require: false
 
@@ -399,6 +400,7 @@ gem 'html2text'
 
 gem 'ruby-prof', '~> 0.17.0'
 gem 'rbtrace', '~> 0.4', require: false
+gem 'memory_profiler', require: false
 
 # OAuth
 gem 'oauth2', '~> 1.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index a63b7cc84aa..61450ebc0e0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -155,6 +155,14 @@ GEM
       html-pipeline
     declarative (0.0.10)
     declarative-option (0.1.0)
+    derailed_benchmarks (1.3.5)
+      benchmark-ips (~> 2)
+      get_process_mem (~> 0)
+      heapy (~> 0)
+      memory_profiler (~> 0)
+      rack (>= 1)
+      rake (> 10, < 13)
+      thor (~> 0.19)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     device_detector (1.0.0)
@@ -377,6 +385,7 @@ GEM
       hashie (>= 3.0)
     health_check (2.6.0)
       rails (>= 4.0)
+    heapy (0.1.4)
     hipchat (1.5.2)
       httparty
       mimemagic
@@ -478,6 +487,7 @@ GEM
     memoist (0.16.0)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
+    memory_profiler (0.9.13)
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
@@ -1034,6 +1044,7 @@ DEPENDENCIES
   creole (~> 0.5.0)
   database_cleaner (~> 1.7.0)
   deckar01-task_list (= 2.2.0)
+  derailed_benchmarks
   device_detector
   devise (~> 4.6)
   devise-two-factor (~> 3.0.0)
@@ -1111,6 +1122,7 @@ DEPENDENCIES
   lograge (~> 0.5)
   loofah (~> 2.2)
   mail_room (~> 0.9.1)
+  memory_profiler
   method_source (~> 0.8)
   mimemagic (~> 0.3.2)
   mini_magick