summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2019-12-02 15:44:18 -0800
committerTim Smith <tsmith84@gmail.com>2019-12-04 16:17:29 -0800
commitb0ff15bbe4f9fbee2f587571fedae67150ad2633 (patch)
tree8f768f8ece0e4f9f80206e8aeda14f6824661fa5
parentbe18023bf828a9801865a1551e7b5da917418982 (diff)
downloadchef-b0ff15bbe4f9fbee2f587571fedae67150ad2633.tar.gz
Update ruby_prof to 1.0prof
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 41fa898cef..464bb02685 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,7 +46,7 @@ end
# Everything except AIX
group(:ruby_prof) do
- gem "ruby-prof", "< 0.18" # 0.18 includes a x64-mingw32 gem, which doesn't load correctly. See https://github.com/ruby-prof/ruby-prof/issues/255
+ gem "ruby-prof"
end
# Everything except AIX and Windows
diff --git a/Gemfile.lock b/Gemfile.lock
index f6b1b16d8b..6046ef5a3b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -311,7 +311,7 @@ GEM
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
- ruby-prof (0.17.0)
+ ruby-prof (1.0.0)
ruby-progressbar (1.10.1)
ruby-shadow (2.5.0)
rubyntlm (0.6.2)
@@ -446,7 +446,7 @@ DEPENDENCIES
rspec-expectations (~> 3.5)
rspec-mocks (~> 3.5)
rspec_junit_formatter (~> 0.2.0)
- ruby-prof (< 0.18)
+ ruby-prof
ruby-shadow
simplecov
webmock