Merge tag '4.8.8-rc'

Data and bug fix release

.codeclimate.yml

@@ -34,7 +34,7 @@ checks:
 plugins:
   rubocop:
     enabled: true
-    channel: rubocop-0-74
+    channel: rubocop-0-76
   brakeman:
     enabled: true
   bundler-audit:

.gitignore

@@ -48,12 +48,12 @@ frontend/.env*
 
 frontend/public/js
 frontend/dist
-frontend/.storybook
 
 frontend/tmp
 
 frontend/gis/cartodb/cartodb-config.json
 
+frontend/coverage/
 frontend/scripts/coverage
 frontend/docs/dist
 frontend/package-lock.json

.rubocop_todo.yml

@@ -1,19 +1,18 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-09-06 12:33:40 +0200 using RuboCop version 0.74.0.
+# on 2019-10-31 09:26:23 +0100 using RuboCop version 0.76.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 5
+# Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: with_first_argument, with_fixed_indentation
 Layout/AlignArguments:
   Exclude:
     - 'db/20190812093710_add_json_path_to_flows.rb'
-    - 'db/20190820105523_create_flow_quant_totals_mv.rb'
 
 # Offense count: 37
 # Cop supports --auto-correct.
@@ -31,13 +30,7 @@ Layout/ClosingParenthesisIndentation:
   Exclude:
     - 'app/services/api/v3/import/stats.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/CommentIndentation:
-  Exclude:
-    - 'app/services/api/v3/supply_chain_country_facts.rb'
-
-# Offense count: 39
+# Offense count: 42
 # Cop supports --auto-correct.
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
@@ -56,7 +49,7 @@ Layout/EndAlignment:
   Exclude:
     - 'app/services/api/v3/actors/top_nodes_summary.rb'
 
-# Offense count: 16
+# Offense count: 28
 # Cop supports --auto-correct.
 # Configuration parameters: IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_brackets
@@ -94,7 +87,7 @@ Layout/SpaceBeforeBlockBraces:
 Layout/TrailingBlankLines:
   Exclude:
     - 'Rakefile'
-    - 'config/deploy/staging.rb'
+    - 'spec/responses/api/v3/commodity_countries_facts_spec.rb'
 
 # Offense count: 2
 Lint/AmbiguousBlockAssociation:
@@ -124,32 +117,32 @@ Lint/UselessAssignment:
   Exclude:
     - 'lib/tasks/db_remote_import.rake'
 
-# Offense count: 68
+# Offense count: 76
 Metrics/AbcSize:
-  Max: 31
+  Max: 46
 
-# Offense count: 15
+# Offense count: 18
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
   Max: 331
 
-# Offense count: 4
+# Offense count: 8
 Metrics/CyclomaticComplexity:
-  Max: 9
+  Max: 11
 
-# Offense count: 171
+# Offense count: 192
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 62
 
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 159
+  Max: 181
 
-# Offense count: 6
+# Offense count: 9
 Metrics/PerceivedComplexity:
-  Max: 10
+  Max: 11
 
 # Offense count: 1
 Naming/AccessorMethodName:
@@ -169,7 +162,7 @@ Naming/PredicateName:
 
 # Offense count: 13
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: io, id, to, by, on, in, at, ip, db
+# AllowedNames: io, id, to, by, on, in, at, ip, db, os
 Naming/UncommunicativeMethodParamName:
   Exclude:
     - 'lib/db_helpers/search_path_helpers.rb'
@@ -183,6 +176,19 @@ Naming/VariableNumber:
   Exclude:
     - 'spec/services/api/v3/actor/basic_attributes_spec.rb'
 
+# Offense count: 3
+# Cop supports --auto-correct.
+Performance/Count:
+  Exclude:
+    - 'app/services/api/v3/database_validation/checks/has_exactly_one_of.rb'
+    - 'app/services/api/v3/database_validation/errors_list.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Performance/Detect:
+  Exclude:
+    - 'spec/services/api/v3/dashboards/filter_metas_spec.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 Performance/InefficientHashSearch:
@@ -228,12 +234,18 @@ Style/HashSyntax:
   Exclude:
     - 'app/models/concerns/api/v3/associated_attributes.rb'
 
-# Offense count: 2
+# Offense count: 16
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
+Style/MutableConstant:
   Exclude:
-    - 'app/services/api/v3/filter_commodities.rb'
-    - 'app/services/api/v3/flows/filter.rb'
+    - 'app/services/api/v3/import/tables.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -279,13 +291,12 @@ Style/SymbolArray:
   Exclude:
     - 'app/controllers/api/v3/countries_controller.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoredMethods.
 # IgnoredMethods: respond_to, define_method
 Style/SymbolProc:
   Exclude:
-    - 'app/services/api/v3/supply_chain_country_facts.rb'
     - 'cms_ideas/batch_save_form.rb'
 
 # Offense count: 3

.travis.yml

@@ -53,8 +53,7 @@ matrix:
 
     - language: node_js
       node_js:
-        - 10
-        - 11
+        - 12
       cache: yarn
       before_install:
         - cd frontend

Capfile

@@ -39,6 +39,7 @@ require 'capistrano/bundler'
 require 'capistrano/rails/migrations'
 require 'capistrano/rails/assets'
 require 'capistrano/passenger'
+require 'capistrano/nvm'
 require 'capistrano/yarn'
 require 'capistrano/sitemap_generator'
 

Gemfile

@@ -11,31 +11,30 @@ gem 'scenic'
 gem 'pg_csv'
 gem 'pg_search'
 gem 'rubyzip'
-gem 'puma', '~> 3.0'
+gem 'puma', '~> 4.2'
 gem 'dotenv-rails', '~> 2.7'
 gem 'active_model_serializers', '~> 0.10.10'
 gem 'kaminari'
-gem 'enumerate_it', '~> 1.4.1'
+gem 'enumerate_it', '~> 3.0.0'
 gem 'mailchimp-api', require: 'mailchimp'
 gem 'oj'
 
-gem 'sass-rails', '~> 5.0'
+gem 'sass-rails', '~> 6.0'
 gem 'uglifier', '>= 1.3.0'
-gem 'coffee-rails', '~> 4.2'
+gem 'coffee-rails', '~> 5.0'
 
 gem 'jquery-rails'
 gem 'turbolinks', '~> 5'
 gem 'jbuilder', '~> 2.9'
 gem 'devise', '~> 4.7'
 gem 'activeadmin', '~> 1.4.3'
 gem 'activeadmin_simplemde'
-gem 'inherited_resources', github: 'activeadmin/inherited_resources'
 gem 'activeadmin_addons'
 gem 'acts_as_list'
 gem 'activeadmin_sortable_table'
 gem 'best_in_place'
 
-gem 'ckeditor', git: 'https://github.com/galetahub/ckeditor.git'
+gem 'ckeditor', '4.3.0'
 gem 'paperclip', '~> 6.1.0'
 gem 'aws-sdk-s3', '~> 1'
 
@@ -44,7 +43,7 @@ gem 'twitter', '~> 6.1'
 
 gem 'appsignal'
 gem 'newrelic_rpm'
-gem 'sidekiq'
+gem 'sidekiq', '~> 5.2.7'
 gem 'sidekiq-unique-jobs'
 gem 'whenever', require: false
 gem 'ransack'
@@ -53,7 +52,7 @@ gem 'sitemap_generator'
 
 group :development, :test do
   gem 'byebug', platform: :mri
-  gem 'rspec-rails', '~> 3.8'
+  gem 'rspec-rails', '~> 3.9'
   gem 'rubocop-rspec'
   gem 'rails-controller-testing'
   gem 'rspec-collection_matchers'
@@ -74,8 +73,9 @@ group :development do
   gem 'capistrano-bundler'
   gem 'capistrano-rvm'
   gem 'capistrano-passenger'
+  gem 'capistrano-nvm'
 
-  gem 'rubocop', '~> 0.74.0', require: false
+  gem 'rubocop', '~> 0.76.0', require: false
   gem 'rubocop-performance', require: false
   gem 'rbnacl', '>= 3.2', '< 5.0'
   gem 'rbnacl-libsodium'