Merge branch 'master' of github.com:indentlabs/notebook

Author: drusepth

.gitignore

@@ -26,6 +26,7 @@ storage/*
 
 # Super-secret stuff
 set_aws_credentials.sh
+.env
 
 # Ignore map images uploaded to Locations
 /locations
@@ -39,3 +40,4 @@ node_modules
 /yarn-error.log
 yarn-debug.log*
 .yarn-integrity
+

.ruby-version

@@ -1 +1 @@
-3.2.1
+3.2.3

Gemfile

@@ -3,7 +3,10 @@ ruby "~> 3.2"
 
 # Server core
 gem 'rails', '~> 6.1'
-gem 'puma', '~> 5.6'
+
+#gem 'puma', '~> 5.6'
+gem 'passenger'
+
 # gem 'bootsnap', require: false
 gem 'sprockets', '~> 4.2.0'
 gem 'terser'

Gemfile.lock

@@ -1493,6 +1493,10 @@ GEM
       terrapin (~> 0.6.0)
     paranoia (2.6.1)
       activerecord (>= 5.1, < 7.1)
+    passenger (6.0.23)
+      rack (>= 1.6.13)
+      rackup
+      rake (>= 12.3.3)
     paypal-checkout-sdk (1.0.4)
       paypalhttp (~> 1.0.1)
     paypal_client (0.4.1)
@@ -1520,6 +1524,9 @@ GEM
       rack
     rack-test (2.1.0)
       rack (>= 1.3)
+    rackup (1.0.1)
+      rack (< 3)
+      webrick
     rails (6.1.7.2)
       actioncable (= 6.1.7.2)
       actionmailbox (= 6.1.7.2)
@@ -1675,6 +1682,7 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
+    webrick (1.9.1)
     websocket (1.2.9)
     websocket-client-simple (0.3.0)
       event_emitter
@@ -1729,11 +1737,11 @@ DEPENDENCIES
   onebox!
   paperclip
   paranoia
+  passenger
   paypal-checkout-sdk
   paypal_client
   pg (~> 1.5)
   pry
-  puma (~> 5.6)
   puma-heroku
   rack-mini-profiler
   rails (~> 6.1)

config/initializers/thredded.rb

@@ -216,7 +216,7 @@ def set_navbar_actions
         @navbar_actions << {
           label: 'Discussions',
           href: discussions_link,
-          class: ForumsLinkbuilderService.is_discussions_page?(request.env['REQUEST_PATH']) ? 'active' : nil
+          class: ForumsLinkbuilderService.is_discussions_page?(request.env['REQUEST_PATH'] || request.fullpath) ? 'active' : nil
         }
       end
 
@@ -238,7 +238,7 @@ def set_sidenav_expansion
     private
 
     def related_content_type
-      current_path = request.env['REQUEST_PATH']
+      current_path = request.env['REQUEST_PATH'] || request.fullpath
       match = ForumsLinkbuilderService.content_to_url_map.detect { |key, base_url| current_path.start_with?(base_url) }
 
       if match

yarn.lock

@@ -2052,9 +2052,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001449:
-  version "1.0.30001452"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001452.tgz#dff7b8bb834b3a91808f0a9ff0453abb1fbba02a"
-  integrity sha512-Lkp0vFjMkBB3GTpLR8zk4NwW5EdRdnitwYJHDOOKIU85x4ckYCPQ+9WlVvSVClHxVReefkUMtWZH2l9KGlD51w==
+  version "1.0.30001695"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001695.tgz"
+  integrity sha512-vHyLade6wTgI2u1ec3WQBxv+2BrTERV28UXQu9LO6lZ9pYeMk34vjXFLOxo1A4UBA8XTL4njRQZdno/yYaSmWw==
 
 case-sensitive-paths-webpack-plugin@^2.4.0:
   version "2.4.0"