diff options
author | Robert Speicher <robert@gitlab.com> | 2016-11-30 05:29:29 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-11-30 05:29:29 +0000 |
commit | 4ecb95949230e2a7000b129a35096e25d0c6572c (patch) | |
tree | 1a77d7694543377329eaa77a78a72adad7f0459c /Gemfile.lock | |
parent | fb17ce1f2f25dde8988f3b2d3abf8d7fc4154c06 (diff) | |
parent | 5e05f9c5c2cfaf14cc0337c23ff54f86c5d5f5a8 (diff) | |
download | gitlab-ce-4ecb95949230e2a7000b129a35096e25d0c6572c.tar.gz |
Merge branch 'add-stackprof' into 'master'
Add StackProf to the Gemfile, along with a utility to get a profile for a spec
The test suite needs speeding up significantly. This is one tool for investigating it.
Related to #23034
See merge request !7784
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 40aa91423c0..1db0e466164 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -692,6 +692,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) + stackprof (0.2.10) state_machines (0.4.0) state_machines-activemodel (0.4.0) activemodel (>= 4.1, < 5.1) @@ -938,6 +939,7 @@ DEPENDENCIES spring-commands-teaspoon (~> 0.0.2) sprockets (~> 3.7.0) sprockets-es6 (~> 0.9.2) + stackprof (~> 0.2.10) state_machines-activerecord (~> 0.4.0) sys-filesystem (~> 1.1.6) teaspoon (~> 1.1.0) |