diff options
| -rw-r--r-- | .flayignore | 35 | ||||
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 7 | ||||
| -rw-r--r-- | Gemfile.rails5.lock | 7 | ||||
| -rw-r--r-- | doc/api/commits.md | 2 | ||||
| -rw-r--r-- | lib/tasks/flay.rake | 9 | ||||
| -rw-r--r-- | lib/tasks/lint.rake | 1 |
7 files changed, 1 insertions, 61 deletions
diff --git a/.flayignore b/.flayignore deleted file mode 100644 index 87411516a2a..00000000000 --- a/.flayignore +++ /dev/null @@ -1,35 +0,0 @@ -*.erb -lib/gitlab/sanitizers/svg/whitelist.rb -lib/gitlab/diff/position_tracer.rb -app/controllers/projects/approver_groups_controller.rb -app/controllers/projects/approvers_controller.rb -app/controllers/projects/protected_branches/merge_access_levels_controller.rb -app/controllers/projects/protected_branches/push_access_levels_controller.rb -app/controllers/projects/protected_tags/create_access_levels_controller.rb -app/helpers/system_note_helper.rb -app/policies/project_policy.rb -app/models/concerns/relative_positioning.rb -app/workers/stuck_merge_jobs_worker.rb -lib/gitlab/redis/*.rb -lib/gitlab/gitaly_client/operation_service.rb -app/models/project_services/packagist_service.rb -lib/gitlab/background_migration/normalize_ldap_extern_uids_range.rb -lib/gitlab/background_migration/* -app/models/project_services/kubernetes_service.rb -lib/gitlab/workhorse.rb -lib/gitlab/ci/trace/chunked_io.rb -lib/gitlab/gitaly_client/ref_service.rb -lib/gitlab/gitaly_client/commit_service.rb -lib/gitlab/git/commit.rb -lib/gitlab/git/tag.rb - -ee/db/**/* -ee/app/serializers/ee/merge_request_widget_entity.rb -ee/lib/api/epics.rb -ee/lib/api/geo_nodes.rb -ee/lib/ee/api/group_boards.rb -ee/lib/ee/api/boards.rb -ee/lib/ee/gitlab/ldap/sync/admin_users.rb -ee/app/workers/geo/file_download_dispatch_worker/job_artifact_job_finder.rb -ee/app/workers/geo/file_download_dispatch_worker/lfs_object_job_finder.rb -ee/spec/**/* @@ -363,7 +363,6 @@ 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.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 11921a64900..43998d6003d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -209,11 +209,6 @@ GEM fast_gettext (1.6.0) ffaker (2.4.0) ffi (1.9.18) - flay (2.10.0) - erubis (~> 2.7.0) - path_expander (~> 1.0) - ruby_parser (~> 3.0) - sexp_processor (~> 4.0) flipper (0.13.0) flipper-active_record (0.13.0) activerecord (>= 3.2, < 6) @@ -588,7 +583,6 @@ GEM parser (2.5.1.0) ast (~> 2.4.0) parslet (1.8.2) - path_expander (1.0.2) peek (1.0.1) concurrent-ruby (>= 0.9.0) concurrent-ruby-ext (>= 0.9.0) @@ -1024,7 +1018,6 @@ DEPENDENCIES faraday (~> 0.12) fast_blank ffaker (~> 2.4) - flay (~> 2.10.0) flipper (~> 0.13.0) flipper-active_record (~> 0.13.0) flipper-active_support_cache_store (~> 0.13.0) diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index 02f9e112300..7344ea5b4d6 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -212,11 +212,6 @@ GEM fast_gettext (1.6.0) ffaker (2.4.0) ffi (1.9.18) - flay (2.10.0) - erubis (~> 2.7.0) - path_expander (~> 1.0) - ruby_parser (~> 3.0) - sexp_processor (~> 4.0) flipper (0.13.0) flipper-active_record (0.13.0) activerecord (>= 3.2, < 6) @@ -592,7 +587,6 @@ GEM parser (2.5.1.0) ast (~> 2.4.0) parslet (1.8.2) - path_expander (1.0.2) peek (1.0.1) concurrent-ruby (>= 0.9.0) concurrent-ruby-ext (>= 0.9.0) @@ -1034,7 +1028,6 @@ DEPENDENCIES faraday (~> 0.12) fast_blank ffaker (~> 2.4) - flay (~> 2.10.0) flipper (~> 0.13.0) flipper-active_record (~> 0.13.0) flipper-active_support_cache_store (~> 0.13.0) diff --git a/doc/api/commits.md b/doc/api/commits.md index d07b9d5614a..624ed529009 100644 --- a/doc/api/commits.md +++ b/doc/api/commits.md @@ -464,7 +464,7 @@ Example response: }, { "started_at" : null, - "name" : "flay", + "name" : "test", "allow_failure" : false, "status" : "pending", "created_at" : "2016-01-19T08:40:25.832Z", diff --git a/lib/tasks/flay.rake b/lib/tasks/flay.rake deleted file mode 100644 index 4bec013a141..00000000000 --- a/lib/tasks/flay.rake +++ /dev/null @@ -1,9 +0,0 @@ -desc 'Code duplication analyze via flay' -task :flay do - output = `bundle exec flay --mass 35 app/ lib/gitlab/ ee/ 2> #{File::NULL}` - - if output.include?("Similar code found") || output.include?("IDENTICAL code found") - puts output - exit 1 - end -end diff --git a/lib/tasks/lint.rake b/lib/tasks/lint.rake index 006fcdd31a4..5d673a1a285 100644 --- a/lib/tasks/lint.rake +++ b/lib/tasks/lint.rake @@ -34,7 +34,6 @@ unless Rails.env.production? config_lint lint:haml scss_lint - flay gettext:lint gettext:updated_check lint:static_verification |