Merge pull request #1870 from codetriage/schneems/update-barnes

Update barnes

Author: schneems

Gemfile

@@ -71,7 +71,7 @@ gem "wicked"
 gem "will_paginate"
 
 # Performance & Monitoring
-gem "barnes", github: "heroku/barnes", branch: "schneems/direct-http-metrics"
+gem "barnes"
 gem "bootsnap", require: false
 gem "flamegraph"
 gem "matrix"

Gemfile.lock

@@ -1,13 +1,3 @@
-GIT
-  remote: https://github.com/heroku/barnes.git
-  revision: 343cc6b85dbae85b38d63bdb0566846120a5772f
-  branch: schneems/direct-http-metrics
-  specs:
-    barnes (1.0.0)
-      json
-      logger
-      ostruct
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -113,6 +103,10 @@ GEM
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
+    barnes (1.0.0)
+      json
+      logger
+      ostruct
     base64 (0.3.0)
     bcrypt (3.1.21)
     benchmark-ips (2.14.0)
@@ -235,7 +229,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.18.1)
+    json (2.19.5)
     judoscale-rails (1.12.2)
       judoscale-ruby (= 1.12.2)
       railties
@@ -634,7 +628,7 @@ DEPENDENCIES
   autoprefixer-rails
   aws-sdk-s3
   babel-transpiler
-  barnes!
+  barnes
   bluecloth
   bootsnap
   bourbon
@@ -734,7 +728,7 @@ CHECKSUMS
   aws-sigv4 (1.12.1) sha256=6973ff95cb0fd0dc58ba26e90e9510a2219525d07620c8babeb70ef831826c00
   babel-source (5.8.35) sha256=79ef222a9dcb867ac2efa3b0da35b4bcb15a4bfa67b6b2dcbf1e9a29104498d9
   babel-transpiler (0.7.0) sha256=4c06f4ad9e8e1cabe94f99e11df2f140bb72aca9ba067dbb49dc14d9b98d1570
-  barnes (1.0.0)
+  barnes (1.0.0) sha256=bf3dede15d9f60d35a5996386e3966a3bf518efde73c751df55e312f5b110cd3
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   bcrypt (3.1.21) sha256=5964613d750a42c7ee5dc61f7b9336fb6caca429ba4ac9f2011609946e4a2dcf
   benchmark-ips (2.14.0) sha256=b72bc8a65d525d5906f8cd94270dccf73452ee3257a32b89fbd6684d3e8a9b1d
@@ -792,7 +786,7 @@ CHECKSUMS
   irb (1.16.0) sha256=2abe56c9ac947cdcb2f150572904ba798c1e93c890c256f8429981a7675b0806
   jmespath (1.6.2) sha256=238d774a58723d6c090494c8879b5e9918c19485f7e840f2c1c7532cf84ebcb1
   jquery-rails (4.6.1) sha256=619f3496cdcdeaae1fd6dafa52dbac3fc45b745d4e09712da4184a16b3a8d9c0
-  json (2.18.1) sha256=fe112755501b8d0466b5ada6cf50c8c3f41e897fa128ac5d263ec09eedc9f986
+  json (2.19.5) sha256=218a18553e4801d579ca7e0f5bc72bafd776d7397238a1fb4e74db5b0a812c59
   judoscale-rails (1.12.2) sha256=ff2bd1023b39ad0e649d71883d81de7e240158ac215031b5fdba8217dfc1c85b
   judoscale-ruby (1.12.2) sha256=c944a97da135e2681df60cc8edbf3f182bdc9c38e00577539a915169dcb0e909
   jwt (3.1.2) sha256=af6991f19a6bb4060d618d9add7a66f0eeb005ac0bc017cd01f63b42e122d535