diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-04-12 21:42:44 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-04-12 21:42:44 +0000 |
| commit | 2bc9a14f687a67b62e3ba972402d92603a59f82b (patch) | |
| tree | 3a1cc5998f7e7502bf3f01e71a284a7d54d737da | |
| parent | 3e19ecae1774f4bbe234c54b0b41c25c78021813 (diff) | |
| parent | 58cd4c48e639ab0ead5d1e1da4677c4b8e05233f (diff) | |
| download | gitlab-ce-2bc9a14f687a67b62e3ba972402d92603a59f82b.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 67b1cace3eb..8ee42875670 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 delegate :line_code, :original_line_code, :diff_file, |