Merge branch 'release/6.8.5'

Gemfile

@@ -135,7 +135,7 @@ gem 'memory_profiler', '~> 1.0.1'
 gem 'rack-mini-profiler', '~> 3.0.0'
 gem 'stackprof', '~> 0.2.25'
 
-gem 'ddtrace', '~> 1.11.1'
+gem 'ddtrace', '~> 1.10.1'
 
 # Make sure filesystem changes only happen at the end of a transaction
 gem 'after_commit_everywhere', '~> 1.3.0'

Gemfile.lock

@@ -133,10 +133,10 @@ GEM
     daemons (1.4.1)
     dalli (3.2.4)
     date (3.3.3)
-    ddtrace (1.11.1)
+    ddtrace (1.10.1)
       debase-ruby_core_source (>= 0.10.16, <= 3.2.0)
       libdatadog (~> 2.0.0.1.0)
-      libddwaf (~> 1.8.2.0.0)
+      libddwaf (~> 1.6.2.0.0)
       msgpack
     debase-ruby_core_source (3.2.0)
     delayed_job (4.1.10)
@@ -237,7 +237,7 @@ GEM
     letter_opener (1.8.1)
       launchy (>= 2.2, < 3)
     libdatadog (2.0.0.1.0-x86_64-linux)
-    libddwaf (1.8.2.0.0-x86_64-linux)
+    libddwaf (1.6.2.0.0-x86_64-linux)
       ffi (~> 1.0)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -266,7 +266,7 @@ GEM
       minitest
     mocha (2.0.2)
       ruby2_keywords (>= 0.0.5)
-    msgpack (1.7.0)
+    msgpack (1.6.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     mustermann (3.0.0)
@@ -528,7 +528,7 @@ DEPENDENCIES
   counter_culture (~> 3.2)
   cssbundling-rails (~> 1.1.2)
   dalli (~> 3.2.4)
-  ddtrace (~> 1.11.1)
+  ddtrace (~> 1.10.1)
   delayed_job_active_record (~> 4.1.7)
   delayed_job_web (~> 1.4.4)
   devise (~> 4.9.2)

config/initializers/00_version.rb

@@ -3,7 +3,7 @@ class Application
     module Version
       MAJOR = 6
       MINOR = 8
-      PATCH = 4
+      PATCH = 5
 
       STRING = [MAJOR, MINOR, PATCH].compact.join('.')
     end