diff options
| author | Phil Hughes <me@iamphill.com> | 2018-10-04 07:37:24 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-10-04 07:37:24 +0000 |
| commit | 14ed916cf2ffe82ca11b8d25a88cb20f88823734 (patch) | |
| tree | 788ed477afe532f5f14e107f7d9218a8bee7c3d3 /lib | |
| parent | 09f6f3eac577f9443dfbafbcbe52531c35f309df (diff) | |
| parent | f09303b00aa61825d2fed22aa04d8c6d1dace1b0 (diff) | |
| download | gitlab-ce-14ed916cf2ffe82ca11b8d25a88cb20f88823734.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 fc280f96ec1..f967494199e 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 |