summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-08-09 10:10:33 +0200
committerRémy Coutable <remy@rymai.me>2017-08-09 10:10:33 +0200
commit0a3f4dfc8232a0314f2dce9b686a16070b6281cf (patch)
tree49602add22bdbb60656dace7d79582cfa623877f
parent932a6e69b882334dd7e8fdf158ebbab4c620a2b5 (diff)
downloadgitlab-ce-0a3f4dfc8232a0314f2dce9b686a16070b6281cf.tar.gz
Don't require stackprof in Gemfile
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--Gemfile2
-rwxr-xr-xbin/rspec-stackprof3
2 files changed, 3 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index fcd4889eea8..2a4b4717153 100644
--- a/Gemfile
+++ b/Gemfile
@@ -355,7 +355,7 @@ group :development, :test do
gem 'activerecord_sane_schema_dumper', '0.2'
- gem 'stackprof', '~> 0.2.10'
+ gem 'stackprof', '~> 0.2.10', require: false
end
group :test do
diff --git a/bin/rspec-stackprof b/bin/rspec-stackprof
index df79feb201d..810863ea4a0 100755
--- a/bin/rspec-stackprof
+++ b/bin/rspec-stackprof
@@ -1,5 +1,6 @@
#!/usr/bin/env ruby
+require 'bundler/setup'
require 'stackprof'
$:.unshift 'spec'
require 'rails_helper'
@@ -13,4 +14,4 @@ StackProf.run(mode: :wall, out: output_file, interval: interval) do
RSpec::Core::Runner.run(ARGV, $stderr, $stdout)
end
-system("stackprof #{output_file} --text --limit #{limit}")
+system("bundle exec stackprof #{output_file} --text --limit #{limit}")