Commit 2bc9a14f authored by Douwe Maan's avatar Douwe Maan

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

Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error

See merge request !10664
parents 3e19ecae 58cd4c48
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
module DiscussionOnDiff module DiscussionOnDiff
extend ActiveSupport::Concern extend ActiveSupport::Concern
included do
NUMBER_OF_TRUNCATED_DIFF_LINES = 16 NUMBER_OF_TRUNCATED_DIFF_LINES = 16
included do
delegate :line_code, delegate :line_code,
:original_line_code, :original_line_code,
:diff_file, :diff_file,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment