Merge remote-tracking branch 'origin/master' into develop

Author: lucacug

CHANGELOG.md

@@ -1,3 +1,9 @@
+### 1.7.1
+
+**CITES Trade DB**
+
+* Update to version 2021.1(replace zip file on the server, update ENV var, text updates)
+
 ### 1.7.0
 
 **Multilingual extension of Tradeplus**

Gemfile

@@ -116,6 +116,9 @@ group :development do
   gem 'git_pretty_accept'
   gem 'rubocop', '~> 0.40.0', require: false
   gem 'letter_opener'
+  gem 'bcrypt_pbkdf'
+  gem 'ed25519'
+  # @TODO: bring back when ruby updated to > 2.6 # gem 'net-ssh', '7.0.0.beta1' # openssl 3.0 compatibility @see https://stackoverflow.com/q/72068406/1090438
 end
 
 group :test, :development do

Gemfile.lock

@@ -76,6 +76,7 @@ GEM
       ember-source (>= 1.0, < 3.1)
       execjs (>= 1.2, < 3)
     bcrypt (3.1.12)
+    bcrypt_pbkdf (1.1.0)
     better_errors (1.1.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -167,6 +168,7 @@ GEM
     dotenv (2.0.1)
     dotenv-rails (2.0.1)
       dotenv (= 2.0.1)
+    ed25519 (1.2.4)
     em-websocket (0.4.0)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.5.3)
@@ -512,6 +514,7 @@ DEPENDENCIES
   annotate (>= 2.5.0)
   appsignal
   aws-sdk (~> 2)
+  bcrypt_pbkdf
   better_errors (~> 1.1.0)
   binding_of_caller (>= 0.7.2)
   bootstrap-sass (~> 2.3.2.2)
@@ -537,6 +540,7 @@ DEPENDENCIES
   database_cleaner (>= 1.2.0)
   devise (~> 3.5.10)
   dotenv-rails
+  ed25519
   ember-data-source (= 0.14)
   ember-rails (~> 0.14.1)
   ember-source (~> 1.6.0)