summaryrefslogtreecommitdiff
path: root/.flayignore
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2017-07-31 19:01:36 -0300
committerOswaldo Ferreira <oswaldo@gitlab.com>2017-08-07 15:23:37 -0300
commit0640b3d1d89b7a4eda343eb23b0518a835ac9106 (patch)
tree13970b43017ada593f08b70ca713dc19a1f064cf /.flayignore
parentb12107a0b953b566cd58db30ae880800a4a695a6 (diff)
downloadgitlab-ce-0640b3d1d89b7a4eda343eb23b0518a835ac9106.tar.gz
Store MergeWorker JID on merge request, and clean up stuck merges
Diffstat (limited to '.flayignore')
-rw-r--r--.flayignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.flayignore b/.flayignore
index e2d0a2e50c5..b63ce4c4df0 100644
--- a/.flayignore
+++ b/.flayignore
@@ -3,4 +3,5 @@ lib/gitlab/sanitizers/svg/whitelist.rb
lib/gitlab/diff/position_tracer.rb
app/policies/project_policy.rb
app/models/concerns/relative_positioning.rb
+app/workers/stuck_merge_jobs_worker.rb
lib/gitlab/redis/*.rb