Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/json.rb')
-rw-r--r--lib/gitlab/json.rb3
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