summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-09-29 07:25:23 +0000
committerRémy Coutable <remy@rymai.me>2016-09-29 07:25:23 +0000
commit7a7799812e9b21c9957e25ec4b48e0648bda20fb (patch)
tree2f266fda6cd1c6c23b153e57a828207259efb137
parent53da820b7ccec481eb01e2cc8be05c4721206942 (diff)
parente3f12e975d59b0606b8f1365e21814b34ea83767 (diff)
downloadgitlab-ce-7a7799812e9b21c9957e25ec4b48e0648bda20fb.tar.gz
Merge branch 'cs-remove-flog-flay' into 'master'
Remove Flog This MR removes the flog gem and its associated rake task as we use the ABC Metrics Rubocop to accomplish the same thing. There's not really any reason to have it anymore. The rest of this MR is kept for posterity and is no longer relevant. ------- After a few months of flog/flay failing silently - and now a week of them failing loudly - I think it's safe to say we don't care enough about flog/flay for them to be worth keeping. If you'd like to keep them around, speak now or forever hold your peace :) See also #17858. See merge request !6554
-rw-r--r--.gitlab-ci.yml3
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock4
-rw-r--r--lib/tasks/flog.rake25
4 files changed, 0 insertions, 33 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f3873e57c1..a11c4705e82 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -209,9 +209,6 @@ rubocop: *exec
rake haml_lint: *exec
rake scss_lint: *exec
rake brakeman: *exec
-rake flog:
- <<: *exec
- allow_failure: yes
rake flay:
<<: *exec
allow_failure: yes
diff --git a/Gemfile b/Gemfile
index f80d745fff8..d6b358f3b43 100644
--- a/Gemfile
+++ b/Gemfile
@@ -300,7 +300,6 @@ group :development, :test do
gem 'scss_lint', '~> 0.47.0', require: false
gem 'haml_lint', '~> 0.18.2', require: false
gem 'simplecov', '0.12.0', require: false
- gem 'flog', '~> 4.3.2', require: false
gem 'flay', '~> 2.6.1', require: false
gem 'bundler-audit', '~> 0.5.0', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 911ffcd7d9c..2b8f28f3ebe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -209,9 +209,6 @@ GEM
flay (2.6.1)
ruby_parser (~> 3.0)
sexp_processor (~> 4.0)
- flog (4.3.2)
- ruby_parser (~> 3.1, > 3.1.0)
- sexp_processor (~> 4.4)
flowdock (0.7.1)
httparty (~> 0.7)
multi_json
@@ -845,7 +842,6 @@ DEPENDENCIES
factory_girl_rails (~> 4.6.0)
ffaker (~> 2.0.0)
flay (~> 2.6.1)
- flog (~> 4.3.2)
fog-aws (~> 0.9)
fog-azure (~> 0.0)
fog-core (~> 1.40)
diff --git a/lib/tasks/flog.rake b/lib/tasks/flog.rake
deleted file mode 100644
index 3bfe999ae74..00000000000
--- a/lib/tasks/flog.rake
+++ /dev/null
@@ -1,25 +0,0 @@
-desc 'Code complexity analyze via flog'
-task :flog do
- output = %x(bundle exec flog -m app/ lib/gitlab)
- exit_code = 0
- minimum_score = 70
- output = output.lines
-
- # Skip total complexity score
- output.shift
-
- # Skip some trash info
- output.shift
-
- output.each do |line|
- score, method = line.split(" ")
- score = score.to_i
-
- if score > minimum_score
- exit_code = 1
- puts "High complexity in #{method}. Score: #{score}"
- end
- end
-
- exit exit_code
-end