diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-22 12:07:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-22 12:07:12 +0300 |
| commit | c76417338ee60071aa41cf292e2c189bd5aa839e (patch) | |
| tree | 57b80a2cc5740b3a724f47fa881cd75b40679ef5 /lib/gitlab/json.rb | |
| parent | be3e27e39dd5c1a72fd4c296858322748db53a26 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/json.rb')
| -rw-r--r-- | lib/gitlab/json.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/gitlab/json.rb b/lib/gitlab/json.rb index 767ce310b5a..f1370a40222 100644 --- a/lib/gitlab/json.rb +++ b/lib/gitlab/json.rb @@ -228,6 +228,14 @@ module Gitlab raise UnsupportedFormatError end + + def render_in(_view_context) + to_s + end + + def format + :json + end end class LimitedEncoder |