Skip to content

Commit

Permalink
Merge pull request #2517 from fluent/fix-redefine-warning
Browse files Browse the repository at this point in the history
http_server helper: Avoid re-define render_json
Signed-off-by: Masahiro Nakagawa <[email protected]>
  • Loading branch information
repeatedly committed Jul 29, 2019
1 parent e21feef commit 3b29e04
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ def self.build(get: nil, head: nil, post: nil, put: nil, patch: nil, delete: nil
headers.each { |k, v| response[k] = v }
response.body = body
end
end

def render_json(code, obj)
[code, { 'Content-Type' => 'application/json' }, obj.to_json]
end
def render_json(code, obj)
[code, { 'Content-Type' => 'application/json' }, obj.to_json]
end
end
end
Expand Down

0 comments on commit 3b29e04

Please sign in to comment.