diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-10-21 16:19:04 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-10-21 16:19:04 +0100 |
| commit | 3176eb83b6da5a66d6a506c7967f434732ae6864 (patch) | |
| tree | f28c95d169b0e360dcbf17fba9a3c772e057fa49 /app/controllers/concerns | |
| parent | 9c3f094a2f7609386ed182e4d5f6f9e7f6938388 (diff) | |
| download | gitlab-ce-3176eb83b6da5a66d6a506c7967f434732ae6864.tar.gz | |
Added discussion_line_code value to note response and use it to query the right row for the discussion UI
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/notes_actions.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/concerns/notes_actions.rb b/app/controllers/concerns/notes_actions.rb index 1126f706393..688bf16cfea 100644 --- a/app/controllers/concerns/notes_actions.rb +++ b/app/controllers/concerns/notes_actions.rb @@ -106,7 +106,8 @@ module NotesActions discussion_resolvable: discussion.resolvable?, diff_discussion_html: diff_discussion_html(discussion), - discussion_html: discussion_html(discussion) + discussion_html: discussion_html(discussion), + discussion_line_code: discussion.line_code, ) end end |