Merge and fix conflicts

.gitignore

@@ -25,11 +25,14 @@ coverage
 node_modules
 /public/packs
 /public/packs-test
+/public/system
+/storage
 /node_modules
 /yarn-error.log
 yarn-debug.log*
 .yarn-integrity
 tmp/cache/webpacker
 
 .byebug_history
-db
+db
+

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "db"]
   path = db
   url = https://github.com/unepwcmc/protectedplanet-db.git
-  branch = master
+  branch = refresh

.travis.yml

@@ -52,6 +52,7 @@ branches:
   only:
     - master
     - develop
+    - refresh
 addons:
   code_climate:
     repo_token:

CHANGELOG.md

@@ -1,3 +1,11 @@
+### 3.2.5
+
+* Add download tracking for links in CMS (e.g. OECM downloads)
+
+### 3.2.4
+
+* Add country, pame_country and marine stats (WDPA December 2019 release).
+
 ### 3.2.3
 
 * Update reference on Target 11 Dashboard to DOPA - again

Gemfile

@@ -1,18 +1,21 @@
 source 'https://rubygems.org'
 
-gem 'rails', '5.0.5'
+gem 'rails', '5.2.0'
 gem 'webpacker', '~> 4.0.2'
 
+gem 'bourbon'
+gem "neat"
+
 gem 'pg', '~> 0.21'
-gem 'activerecord-postgis-adapter', '4.1.0'
+gem 'activerecord-postgis-adapter', '5.1.0'
 gem 'dbf', '~> 2.0.7'
 #
 gem 'elasticsearch', '~> 7.2.0'
 #
 gem 'sass-rails', '~> 5.0.7'
 gem 'sprockets-rails', '~> 3.2.1'
 
-gem 'uglifier', '~> 2.7.2'
+gem 'uglifier', '~> 4.1.17'
 gem 'coffee-rails', '~> 4.2.2'
 gem "autoprefixer-rails"
 gem "exception_notification", '~> 4.3.0'
@@ -101,9 +104,9 @@ gem 'turnout', '~> 2.5.0'
 
 gem 'bystander', '2.0.0', git: 'https://github.com/unepwcmc/bystander'
 
-gem 'devise', '~> 4.6.2' # MAJOR VERSION CHANGE, CHECK DOCS
+gem 'devise', '~> 4.7.1' # MAJOR VERSION CHANGE, CHECK DOCS
 
-gem 'comfortable_mexican_sofa', '1.12.10'
-gem 'nokogiri', '~> 1.10.1'
+gem 'comfortable_mexican_sofa', '~> 2.0.0'
+gem 'nokogiri', '~> 1.10.4'
 gem 'tinymce-rails', '~> 4.3.2'
 gem 'phantompdf', '~> 1.2.2'