Merge branch 'release-0.0.3'

CHANGELOG.md

@@ -1,7 +1,14 @@
-## 0.0.1
+## 0.0.3
+
+* Update text, add RedList logo to footer, change Ocean+ Data Viewer logo
 
-* First release
 
 ## 0.0.2
 
 * Upgrade to webpack 4 using vue-cli-service
+
+
+## 0.0.1
+
+* First release
+

Gemfile

@@ -13,3 +13,5 @@ gem 'capistrano-yarn'
 gem 'capistrano-npm'
 end
 
+gem "ed25519", "~> 1.2"
+gem "bcrypt_pbkdf", "~> 1.1"

Gemfile.lock

@@ -1,97 +1,103 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
-      rack (~> 2.0)
+    actionpack (6.1.7)
+      actionview (= 6.1.7)
+      activesupport (= 6.1.7)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.1.7)
+      activesupport (= 6.1.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.2.3)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activesupport (6.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    airbrussh (1.3.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    airbrussh (1.4.1)
       sshkit (>= 1.6.1, != 1.7.0)
-    builder (3.2.3)
-    capistrano (3.11.0)
+    bcrypt_pbkdf (1.1.0)
+    builder (3.2.4)
+    capistrano (3.11.2)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    capistrano-bundler (1.5.0)
+    capistrano-bundler (1.6.0)
       capistrano (~> 3.1)
     capistrano-npm (1.0.3)
       capistrano (>= 3.0.0)
     capistrano-nvm (0.0.7)
       capistrano (~> 3.1)
     capistrano-passenger (0.1.1)
       capistrano (~> 3.0)
-    capistrano-rails (1.4.0)
+    capistrano-rails (1.6.2)
       capistrano (~> 3.1)
-      capistrano-bundler (~> 1.1)
+      capistrano-bundler (>= 1.1, < 3)
     capistrano-rvm (0.1.2)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
     capistrano-yarn (2.0.2)
       capistrano (~> 3.0)
-    concurrent-ruby (1.1.5)
-    crass (1.0.4)
-    erubi (1.8.0)
-    i18n (1.6.0)
+    concurrent-ruby (1.1.10)
+    crass (1.0.6)
+    ed25519 (1.3.0)
+    erubi (1.11.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.2.3)
+    loofah (2.19.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    method_source (0.9.2)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    net-scp (2.0.0)
-      net-ssh (>= 2.6.5, < 6.0.0)
-    net-ssh (5.2.0)
-    nokogiri (1.10.3)
-      mini_portile2 (~> 2.4.0)
-    rack (2.0.7)
-    rack-proxy (0.6.5)
+    method_source (1.0.0)
+    mini_portile2 (2.6.1)
+    minitest (5.15.0)
+    net-scp (3.0.0)
+      net-ssh (>= 2.6.5, < 7.0.0)
+    net-ssh (6.1.0)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    racc (1.6.0)
+    rack (2.2.4)
+    rack-proxy (0.7.4)
       rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    rack-test (2.0.2)
+      rack (>= 1.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails-html-sanitizer (1.4.3)
+      loofah (~> 2.3)
+    railties (6.1.7)
+      actionpack (= 6.1.7)
+      activesupport (= 6.1.7)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (12.3.2)
-    sshkit (1.18.2)
+      rake (>= 12.2)
+      thor (~> 1.0)
+    rake (13.0.6)
+    sshkit (1.21.3)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    webpacker (4.0.4)
+    thor (1.2.1)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    webpacker (4.0.7)
       activesupport (>= 4.2)
       rack-proxy (>= 0.6.1)
       railties (>= 4.2)
+    zeitwerk (2.6.0)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
+  bcrypt_pbkdf (~> 1.1)
   capistrano (~> 3.11.0)
   capistrano-bundler (~> 1.1)
   capistrano-npm
@@ -100,7 +106,8 @@ DEPENDENCIES
   capistrano-rails (~> 1.1)
   capistrano-rvm (~> 0.1)
   capistrano-yarn
+  ed25519 (~> 1.2)
   webpacker (~> 4.0.0)
 
 BUNDLED WITH
-   1.17.3
+   2.3.21

config/deploy/staging.rb

@@ -1,5 +1,5 @@
 set :stage, :staging
-set :branch, "webpack-4"
+set :branch, "update-landing-page"
 
 
 server "web-supported-staging.linode.unep-wcmc.org", user: 'wcmc', roles: %w{app web db}