diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-04-12 21:42:44 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-13 20:11:36 +0800 |
| commit | 4d293298c58e36768c08f5ba8fbb88816c1ebf38 (patch) | |
| tree | e3d621e0e0d022af621421a084c36b63fbb8c790 | |
| parent | cb858c8017911390ab0eafe76bf0ac2ab362ffbe (diff) | |
| download | gitlab-ce-4d293298c58e36768c08f5ba8fbb88816c1ebf38.tar.gz | |
Merge branch 'rs-fix-already-defined-constant' into 'master'
Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error
See merge request !10664
| -rw-r--r-- | app/models/concerns/discussion_on_diff.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/discussion_on_diff.rb b/app/models/concerns/discussion_on_diff.rb index 87db0c810c3..b3c2f730e5f 100644 --- 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, |