diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 12:26:25 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 12:26:25 +0000 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /config/initializers/multi_json.rb | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) | |
download | gitlab-ce-a09983ae35713f5a2bbb100981116d31ce99826e.tar.gz |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'config/initializers/multi_json.rb')
-rw-r--r-- | config/initializers/multi_json.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/initializers/multi_json.rb b/config/initializers/multi_json.rb new file mode 100644 index 00000000000..93a81d8320d --- /dev/null +++ b/config/initializers/multi_json.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +# Explicitly set the JSON adapter used by MultiJson +# Currently we want this to default to the existing json gem +MultiJson.use(:json_gem) |