commit a8e2359329cf9ca1d00720ff77957f6dd0c678ba
author Erik Benoist <erik@reverb.com> Tue May 22 10:14:04 2018 -0500
committer Paul Yang <TeBoring@users.noreply.github.com> Tue May 22 08:14:04 2018 -0700
tree 41a3c2df105591c3dca1690c6ec5f0236cb6f516
parent dd2dc0f14f9e5dc4e8343cc5f78d5f0bddd8991c

Allows the json marshaller to be passed json marshal options (#4252)

ruby/lib/google/protobuf.rb

diff --git a/ruby/lib/google/protobuf.rb b/ruby/lib/google/protobuf.rb
index 9b8d823..4a805e8 100644
--- a/ruby/lib/google/protobuf.rb
+++ b/ruby/lib/google/protobuf.rb
@@ -60,8 +60,8 @@
       msg.to_proto
     end
 
-    def self.encode_json(msg)
-      msg.to_json
+    def self.encode_json(msg, options = {})
+      msg.to_json(options)
     end
 
     def self.decode(klass, proto)