diff options
author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-06-05 19:56:42 -0300 |
---|---|---|
committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-06-06 16:21:24 -0300 |
commit | 02e64a698d8b81ad712fc5ef2e1cb62e2e6e1656 (patch) | |
tree | 207915a0d0b39a0fb9a955ff724fa26bc65206e1 | |
parent | 862dd49e4b5960e39f233c9ed923c8465956d36f (diff) | |
download | gitlab-ce-02e64a698d8b81ad712fc5ef2e1cb62e2e6e1656.tar.gz |
Remove debuggers
-rw-r--r-- | lib/gitlab/diff/highlight.rb | 1 | ||||
-rw-r--r-- | lib/gitlab/git/conflict/file.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/lib/gitlab/diff/highlight.rb b/lib/gitlab/diff/highlight.rb index 72731d5578f..5c1baa19b66 100644 --- a/lib/gitlab/diff/highlight.rb +++ b/lib/gitlab/diff/highlight.rb @@ -24,7 +24,6 @@ module Gitlab # ignore highlighting for "match" lines next diff_line if diff_line.meta? - binding.pry rich_line = highlight_line(diff_line) || diff_line.text if line_inline_diffs = inline_diffs[i] diff --git a/lib/gitlab/git/conflict/file.rb b/lib/gitlab/git/conflict/file.rb index e50263898aa..f08dab59ce4 100644 --- a/lib/gitlab/git/conflict/file.rb +++ b/lib/gitlab/git/conflict/file.rb @@ -18,7 +18,6 @@ module Gitlab end def lines - binding.pry return @lines if defined?(@lines) begin |