diff options
| author | Phil Hughes <me@iamphill.com> | 2018-10-04 07:37:24 +0000 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-10-12 15:11:03 +0200 |
| commit | 95d90966d1e0e066fb02f08cb76f7d0ef262b429 (patch) | |
| tree | 237139da7ba5fb0ac3b85b54bd1b35abd39bca93 /lib | |
| parent | 30f019dca78bb64bcb8b355a267be006884e6d8f (diff) | |
| download | gitlab-ce-95d90966d1e0e066fb02f08cb76f7d0ef262b429.tar.gz | |
Merge branch '51958-fix-mr-discussion-loading' into 'master'
Fix MR discussion not loaded issue
Closes #51958
See merge request gitlab-org/gitlab-ce!21982
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/diff/position.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/diff/position.rb b/lib/gitlab/diff/position.rb index 978962ab2eb..300f37a95c1 100644 --- a/lib/gitlab/diff/position.rb +++ b/lib/gitlab/diff/position.rb @@ -69,6 +69,10 @@ module Gitlab JSON.generate(formatter.to_h, opts) end + def as_json(opts = nil) + to_h.as_json(opts) + end + def type formatter.line_age end |