Merge branch 'release/5.2.1' into fix_issue_667

.ruby-version

@@ -1 +1 @@
-ruby-2.3.0
+ruby-2.3.8

.travis.yml

@@ -7,8 +7,19 @@ sudo: false
 # versions of ruby to use
 # see the list at http://rubies.travis-ci.org/
 rvm:
-  - 2.2.4
-  - 2.3.0
+  - 2.2.9
+  - 2.3.8
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: 2.2.9
+    - rvm: 2.4.6
+    - rvm: 2.5.5
+    - rvm: 2.6.3
 
 # used for all ruby tasks to specify the database
 env:
@@ -25,7 +36,7 @@ addons:
   postgresql: 9.5
   apt:
     packages:
-      - postgresql-9.5-postgis-2.3
+      - postgresql-9.5-postgis-2.4
 
 # notifications should go to gitter
 notifications:
@@ -42,6 +53,9 @@ notifications:
 services:
   - postgresql
 
+install:
+  - bundle install --jobs=3 --retry=3 --with docker --without "javascript_testing"
+
 before_script:
   - psql -U postgres -c "CREATE EXTENSION postgis"
   - psql -U postgres -c "CREATE USER bety WITH SUPERUSER CREATEDB UNENCRYPTED PASSWORD 'bety'";

CHANGELOG.md

@@ -5,7 +5,9 @@ section for the next release.
 
 For more information about this file see also [Keep a Changelog](http://keepachangelog.com/) .
 
-## [Unreleased]
+## [5.2.1] - 2019-08-07
+
+Currently the tested and recommended version of Ruby to be used with BETY is 2.3. BETY compiles and passes tests with 2.4 and 2.5 but have not been tested thoroughly. Currently BETY does not compile with Ruby 2.6 (see #667).
 
 ### Added
 
@@ -15,11 +17,14 @@ For more information about this file see also [Keep a Changelog](http://keepacha
 
 - Documentation updates, now point to new [documentation location](https://pecanproject.github.io/bety-documentation/index.html)
 - #652 : Better list of soil choices
+- Ruby 2.3.8 is now default ruby when using RVM.
 
 ### Fixed
 
 - Updated GEM list to fix security fixes as recommended by dependbot on GitHub.
-
+- Restores method assignment in Bulk Uploads
+- Fixed travis build, testing with 2.2, 2.3, 2.4, 2.5 and 2.6 of Ruby.
+- Fixed errors when running BETY with 2.4 and 2.5
 
 ## [5.2.0] - 2019-03-11
 

Gemfile.lock

@@ -63,7 +63,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (>= 2.0, < 4.0)
-    capybara-webkit (1.15.0)
+    capybara-webkit (1.15.1)
       capybara (>= 2.3, < 4.0)
       json
     childprocess (0.9.0)
@@ -298,3 +298,6 @@ DEPENDENCIES
   will_paginate
   yajl-ruby (~> 1.3.1)
   yard
+
+BUNDLED WITH
+   1.17.3

app/models/bulk_upload_data_set.rb

@@ -1900,7 +1900,9 @@ def get_insertion_data
     # Get interactively-specified values, or set to empty hash if nil; since we
     # are going to alter interactively_specified_values, we use clone to make a
     # copy so that the session value remains as is.
-    interactively_specified_values = @session["global_values"].clone rescue ActionController::Parameters.new
+    interactively_specified_values = @session.has_key?(:global_values) \
+                                     ? @session[:global_values].clone \
+                                     : ActionController::Parameters.new
 
     # TO DO: decide if this code serves any useful purpose:
     # Double-check that all form fields are were non-empty:

spec/rails_helper.rb

@@ -69,8 +69,10 @@
     Bundler.require('javascript_testing')
     Capybara.javascript_driver = :webkit
 
-    Capybara::Webkit.configure do |config|
-      config.block_unknown_urls
+    if defined?(Capybara::Webkit)
+      Capybara::Webkit.configure do |config|
+        config.block_unknown_urls
+      end
     end
 
     class Binding