Merge tag '4.3.0-rc3'

Data and bug fix release

.env.sample

@@ -7,7 +7,11 @@ POSTGRES_PASSWORD=
 POSTGRES_PORT=
 MAILCHIMP_API_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 MAILCHIMP_LIST_ID=xxxxxxxxxx
+
 APPSIGNAL_PUSH_API_KEY=
+APPSIGNAL_APP_NAME=Trase
+APPSIGNAL_APP_ENV=
+
 GOLD_MASTER_HOST_V3=http://localhost:3000
 TRASE_REMOTE_HOST=localhost
 TRASE_REMOTE_PORT=5432

.gitignore

@@ -51,3 +51,6 @@ frontend/dist
 frontend/tmp
 
 frontend/gis/cartodb/cartodb-config.json
+
+frontend/scripts/coverage
+

.rubocop.yml

@@ -25,11 +25,12 @@ Layout/MultilineOperationIndentation:
 Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
 
-Lint/RescueWithoutErrorClass:
+Style/RescueStandardError:
   Enabled: false
 
 Metrics/BlockLength:
   Exclude:
+    - 'config/routes.rb'
     - 'spec/**/*'
     - 'lib/tasks/**/*'
     - 'app/admin/**/*'

.travis.yml

@@ -4,11 +4,14 @@ env:
     - CC_TEST_REPORTER_ID=ae4098e380eed3c112bd34c4c2ceec913288ce9479bb748bf098a57b75ff5de5
     - API_V3_URL=http://0.0.0.0:3000
     - PORT=3000
+    - JEST_CI=true
+    - USE_PLAIN_URL_STATE=true
 matrix:
   include:
     - language: ruby
       rvm:
         - 2.4.2
+        - 2.5.3
       services:
         - postgresql
       addons:
@@ -27,13 +30,19 @@ matrix:
 
 
     - language: node_js
-      addons:
-        chrome: stable
       node_js:
         - 10
+        - 11
       before_install:
         - cd frontend
       install:
         - npm install
+      before_script:
+        - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+        - chmod +x ./cc-test-reporter
+        - ./cc-test-reporter before-build
       script:
         - npm run ci
+      after_script:
+        - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
+

Gemfile

@@ -5,7 +5,7 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
-gem 'rails', '~> 5.1.6'
+gem 'rails', '~> 5.2.1'
 gem 'pg', '~> 0.18'
 gem 'scenic'
 gem 'pg_csv'
@@ -14,6 +14,7 @@ gem 'rubyzip'
 gem 'puma', '~> 3.0'
 gem 'dotenv-rails', '~> 2.2'
 gem 'active_model_serializers', '~> 0.10.0'
+gem 'kaminari'
 gem 'enumerate_it', '~> 1.4.1'
 gem 'mailchimp-api', require: 'mailchimp'
 gem 'oj'
@@ -26,9 +27,10 @@ gem 'jquery-rails'
 gem 'turbolinks', '~> 5'
 gem 'jbuilder', '~> 2.5'
 gem 'devise', '~> 4.2'
-gem 'activeadmin', '~> 1.2.1'
+gem 'activeadmin', '~> 1.3.1'
 gem 'activeadmin_simplemde'
 gem 'inherited_resources', github: 'activeadmin/inherited_resources'
+gem 'activeadmin_addons'
 
 gem 'ckeditor', git: 'https://github.com/galetahub/ckeditor.git'
 gem 'paperclip', '~> 5.2.0'
@@ -41,10 +43,13 @@ gem 'appsignal'
 gem 'sidekiq'
 gem 'sidekiq-unique-jobs'
 gem 'whenever', require: false
+gem 'ransack'
+gem 'bootsnap'
 
 group :development, :test do
   gem 'byebug', platform: :mri
   gem 'rspec-rails', '~> 3.5'
+  gem 'rubocop-rspec'
   gem 'rails-controller-testing'
   gem 'rspec-collection_matchers'
   gem 'factory_bot_rails'
@@ -66,6 +71,9 @@ group :development do
   gem 'capistrano-passenger'
   gem 'capistrano-npm'
   gem 'rubocop', require: false
+  gem 'rbnacl', '>= 3.2', '< 5.0'
+  gem 'rbnacl-libsodium'
+  gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
 end
 
 group :test do