summaryrefslogtreecommitdiff
path: root/app/models/discussion.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-08-19 12:38:40 -0500
committerDouwe Maan <douwe@selenight.nl>2016-08-19 12:38:40 -0500
commit080924f979df39ad96eb1ab4a029d032bcba6e86 (patch)
tree2451fa0f6a8d0eb82b42789b40150f6a13243910 /app/models/discussion.rb
parent8d3ef366222423a295fed676bdddd1060071320e (diff)
downloadgitlab-ce-080924f979df39ad96eb1ab4a029d032bcba6e86.tar.gz
Fix bug where notes weren’t shown in discussion when the code had changed after creation
Diffstat (limited to 'app/models/discussion.rb')
-rw-r--r--app/models/discussion.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/discussion.rb b/app/models/discussion.rb
index 3fddc084af2..9676bc03470 100644
--- a/app/models/discussion.rb
+++ b/app/models/discussion.rb
@@ -12,6 +12,7 @@ class Discussion
:for_merge_request?,
:line_code,
+ :original_line_code,
:diff_file,
:for_line?,
:active?,