summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-09-28 14:58:39 +0000
committerDouwe Maan <douwe@gitlab.com>2016-09-28 14:58:39 +0000
commit76039e0188bd64ee6c9ce3427b5a4725a3ed8e64 (patch)
tree9acfcb415644aee07b8c38f7c674be60c9130c20
parentdd435f18fe227e8a433dbad36f7cbee72ff2d546 (diff)
parent40f9fef197d3f8a6edb5e2a8b0ef180259b3e98b (diff)
downloadgitlab-ce-76039e0188bd64ee6c9ce3427b5a4725a3ed8e64.tar.gz
Merge branch '22202-reduce-duplication-in-gitlab-diff-position_tracer' into 'master'
Reduce duplication in `Gitlab::Diff::PositionTracer` ## What does this MR do? This factorize similar code from `Gitlab::Diff::PositionTracer` ## Are there points in the code the reviewer needs to double check? The code might be harder to understand now... ## Why was this MR needed? To get rid of flay offense. ## Does this MR meet the acceptance criteria? - Tests - [x] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22202 See merge request !6365
-rw-r--r--.flayignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.flayignore b/.flayignore
index f120de527bd..44df2ba2371 100644
--- a/.flayignore
+++ b/.flayignore
@@ -1,2 +1,3 @@
*.erb
lib/gitlab/sanitizers/svg/whitelist.rb
+lib/gitlab/diff/position_tracer.rb