diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-01-08 12:59:19 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-01-08 12:59:19 -0600 |
| commit | 606b5094c15f36ebd9d697440446c48b54d40e6c (patch) | |
| tree | ddb7bf3dfa8d925c38307bca0ff8837cc9d3741f /app/models/diff_note.rb | |
| parent | 7f7a18c0c37a11b1eba2ac5575087b7b85c3ec5f (diff) | |
| parent | 1d7b46062feb1d93dd3efaf6ba4d5d934068342c (diff) | |
| download | gitlab-ce-improve-table-pagination-spec.tar.gz | |
Merge branch 'master' into improve-table-pagination-specimprove-table-pagination-spec
Diffstat (limited to 'app/models/diff_note.rb')
| -rw-r--r-- | app/models/diff_note.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb index b53d44cda95..15122cbc693 100644 --- a/app/models/diff_note.rb +++ b/app/models/diff_note.rb @@ -21,7 +21,7 @@ class DiffNote < Note before_validation :set_original_position, on: :create before_validation :update_position, on: :create, if: :on_text? - before_validation :set_line_code + before_validation :set_line_code, if: :on_text? after_save :keep_around_commits def discussion_class(*) @@ -61,10 +61,6 @@ class DiffNote < Note @diff_line ||= diff_file&.line_for_position(self.original_position) end - def for_line?(line) - diff_file.position(line) == self.original_position - end - def original_line_code return unless on_text? |