Merge branch 'rs-fix-already-defined-constant' into 'master'

Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error See merge request !10664

Merge branch 'rs-fix-already-defined-constant' into 'master'
Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error See merge request !10664
4d293298 · Douwe Maan · Lin Jen-Shin · cb858c80 · 4d293298
Commit 4d293298 authored Apr 12, 2017 by Douwe Maan Committed by Lin Jen-Shin Apr 13, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/models/concerns/discussion_on_diff.rb app/models/concerns/discussion_on_diff.rb +2 -2

No files found.
--- a/app/models/concerns/discussion_on_diff.rb
+++ b/app/models/concerns/discussion_on_diff.rb
@@ -2,9 +2,9 @@
 module DiscussionOnDiff
  extend ActiveSupport::Concern

-  included do
-    NUMBER_OF_TRUNCATED_DIFF_LINES = 16
+  NUMBER_OF_TRUNCATED_DIFF_LINES = 16

+  included do
    memoized_values << :active

    delegate  :line_code,