Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-10-21 20:16:35 +0300
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-10-21 20:16:35 +0300
commitd635f8bbe17e05fb6b69ccd79b127660039c5894 (patch)
treed83ac052274e8464a6a7d3c29cc2187e53ac7d8e /app/controllers/concerns
parent3176eb83b6da5a66d6a506c7967f434732ae6864 (diff)
Improve discussion_line_code set and update notes_controller_spec
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r--app/controllers/concerns/notes_actions.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/concerns/notes_actions.rb b/app/controllers/concerns/notes_actions.rb
index 688bf16cfea..d46a4dffa29 100644
--- a/app/controllers/concerns/notes_actions.rb
+++ b/app/controllers/concerns/notes_actions.rb
@@ -107,8 +107,9 @@ module NotesActions
diff_discussion_html: diff_discussion_html(discussion),
discussion_html: discussion_html(discussion),
- discussion_line_code: discussion.line_code,
)
+
+ attrs[:discussion_line_code] = discussion.line_code if discussion.is_a?(DiffDiscussion)
end
end
else