diff options
| author |  Paul Yang <TeBoring@users.noreply.github.com> | 2018-05-25 13:43:22 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-05-25 13:43:22 -0700 |
| commit | 4885b8058a93c1a16efe41fd1830d321e9bb2ce6 (patch) | |
| tree | 0069b72edfd5639db022fb985b8a4e57abf6967c /ruby/lib/google/protobuf.rb | |
| parent | 449e532b087e43a45ca6d8eae640a6019e547aca (diff) | |
| parent | dadc95438ff732cb0c1d2961ce7bcf0d99d179b1 (diff) | |
Merge pull request #4675 from TeBoring/3.6.x
Cherry-pick php generated code changes into 3.6.x
Diffstat (limited to 'ruby/lib/google/protobuf.rb')
| -rw-r--r-- | ruby/lib/google/protobuf.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ruby/lib/google/protobuf.rb b/ruby/lib/google/protobuf.rb index 9b8d8231..4a805e88 100644 --- a/ruby/lib/google/protobuf.rb +++ b/ruby/lib/google/protobuf.rb @@ -60,8 +60,8 @@ module Google 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) |