From a248e7adf3c11bf9e0231570163930c953a1a8ee Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <git@zjvandeweg.nl>
Date: Wed, 31 Jan 2018 13:41:14 +0100
Subject: Fix flay not detecting identical code

Previously the script checked only for 'Similar code', but flay will
tell users when IDENTICAL code is detected too. This should create a
commit will create a failing pipeline, and to check that it does this
commit is pushed.

Fixes #42628
---
 lib/tasks/flay.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/flay.rake b/lib/tasks/flay.rake
index b1e012e70c5..4b4881cecb8 100644
--- a/lib/tasks/flay.rake
+++ b/lib/tasks/flay.rake
@@ -2,7 +2,7 @@ desc 'Code duplication analyze via flay'
 task :flay do
   output = `bundle exec flay --mass 35 app/ lib/gitlab/ 2> #{File::NULL}`
 
-  if output.include? "Similar code found"
+  if output.include?("Similar code found") || output.include?("IDENTICAL code found")
     puts output
     exit 1
   end
-- 
cgit v1.2.1


From 830700e2a46daa8731101c44d1eba24ce7eb6877 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <git@zjvandeweg.nl>
Date: Wed, 31 Jan 2018 14:18:11 +0100
Subject: Upgrade Flay to have fewer parsing errors

Gem is updated from 2.8 to 2.10. [changelog][1]

[1]: https://github.com/seattlerb/flay/blob/master/History.rdoc
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 05f72b6482f..56842d62d39 100644
--- a/Gemfile
+++ b/Gemfile
@@ -349,7 +349,7 @@ group :development, :test do
   gem 'scss_lint', '~> 0.56.0', require: false
   gem 'haml_lint', '~> 0.26.0', require: false
   gem 'simplecov', '~> 0.14.0', require: false
-  gem 'flay', '~> 2.8.0', require: false
+  gem 'flay', '~> 2.10.0', require: false
   gem 'bundler-audit', '~> 0.5.0', require: false
 
   gem 'benchmark-ips', '~> 2.3.0', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 1a3c8f42469..ed120720242 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -211,7 +211,7 @@ GEM
     fast_gettext (1.4.0)
     ffaker (2.4.0)
     ffi (1.9.18)
-    flay (2.8.1)
+    flay (2.10.0)
       erubis (~> 2.7.0)
       path_expander (~> 1.0)
       ruby_parser (~> 3.0)
@@ -588,7 +588,7 @@ GEM
       ast (~> 2.3)
     parslet (1.5.0)
       blankslate (~> 2.0)
-    path_expander (1.0.1)
+    path_expander (1.0.2)
     peek (1.0.1)
       concurrent-ruby (>= 0.9.0)
       concurrent-ruby-ext (>= 0.9.0)
@@ -1037,7 +1037,7 @@ DEPENDENCIES
   faraday (~> 0.12)
   fast_blank
   ffaker (~> 2.4)
-  flay (~> 2.8.0)
+  flay (~> 2.10.0)
   flipper (~> 0.11.0)
   flipper-active_record (~> 0.11.0)
   flipper-active_support_cache_store (~> 0.11.0)
-- 
cgit v1.2.1


From 9318f4ab2b6396782edb277aeddf45720d70b7e6 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <git@zjvandeweg.nl>
Date: Wed, 31 Jan 2018 14:39:11 +0100
Subject: Ignore Flay failures

---
 .flayignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.flayignore b/.flayignore
index acac0ce14c9..87cb3507b05 100644
--- a/.flayignore
+++ b/.flayignore
@@ -6,3 +6,5 @@ app/models/concerns/relative_positioning.rb
 app/workers/stuck_merge_jobs_worker.rb
 lib/gitlab/redis/*.rb
 lib/gitlab/gitaly_client/operation_service.rb
+lib/gitlab/background_migration/*
+app/models/project_services/kubernetes_service.rb
-- 
cgit v1.2.1