diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-13 15:09:08 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-13 15:09:08 +0000 |
| commit | ff430539d5299de3a066cb8397b302626761a745 (patch) | |
| tree | 45d06b279990581c8cee5d4136715572bc696ec4 /config/initializers/multi_json.rb | |
| parent | ce34395e91c28f282eeff3792caee84438ebb8a0 (diff) | |
| download | gitlab-ce-ff430539d5299de3a066cb8397b302626761a745.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
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) |