diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-18 15:09:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-18 15:09:21 +0300 |
| commit | a300f4d5c7fdd5d557288ee526986e0adb683b35 (patch) | |
| tree | 8fb18970393c8b4e3b9681262b0318db00f7ba51 /lib/gitlab/json.rb | |
| parent | 7bbc9509dc0567d2a2d8314e99179aaad33ba361 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/json.rb')
| -rw-r--r-- | lib/gitlab/json.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/gitlab/json.rb b/lib/gitlab/json.rb index ce07752f88c..823d6202b1e 100644 --- a/lib/gitlab/json.rb +++ b/lib/gitlab/json.rb @@ -34,6 +34,7 @@ module Gitlab alias_method :parse!, :parse alias_method :load, :parse + alias_method :decode, :parse # Restricted method for converting a Ruby object to JSON. If you # need to pass options to this, you should use `.generate` instead, @@ -56,6 +57,8 @@ module Gitlab adapter_generate(object, opts) end + alias_method :encode, :generate + # Generates JSON for an object and makes it look purdy # # The Oj variant in this looks seriously weird but these are the settings |