diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-09 15:11:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-09 15:11:57 +0300 |
| commit | 1f229cdc22b5b32989bcff2037d8925c75703671 (patch) | |
| tree | c92e9dff7737e78d7331518cdf69f90403af09ea /lib/gitlab/word_diff | |
| parent | 7a98d989740ec85982cdb6c1d57c8f24270e455e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/word_diff')
| -rw-r--r-- | lib/gitlab/word_diff/segments/diff_hunk.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/gitlab/word_diff/segments/diff_hunk.rb b/lib/gitlab/word_diff/segments/diff_hunk.rb index 88b6817676f..13f71f2bc04 100644 --- a/lib/gitlab/word_diff/segments/diff_hunk.rb +++ b/lib/gitlab/word_diff/segments/diff_hunk.rb @@ -16,11 +16,15 @@ module Gitlab end def pos_old - line.match(/\-[0-9]*/)[0].to_i.abs rescue 0 + line.match(/\-[0-9]*/)[0].to_i.abs + rescue StandardError + 0 end def pos_new - line.match(/\+[0-9]*/)[0].to_i.abs rescue 0 + line.match(/\+[0-9]*/)[0].to_i.abs + rescue StandardError + 0 end def first_line? |