Skip to content

Commit fe02d3f

Browse files
committed
Merge branch 'master' of github.com:indentlabs/notebook
2 parents b208dd6 + 3f79d55 commit fe02d3f

File tree

6 files changed

+21
-8
lines changed

6 files changed

+21
-8
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ storage/*
2626

2727
# Super-secret stuff
2828
set_aws_credentials.sh
29+
.env
2930

3031
# Ignore map images uploaded to Locations
3132
/locations
@@ -39,3 +40,4 @@ node_modules
3940
/yarn-error.log
4041
yarn-debug.log*
4142
.yarn-integrity
43+

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.1
1+
3.2.3

Gemfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ ruby "~> 3.2"
33

44
# Server core
55
gem 'rails', '~> 6.1'
6-
gem 'puma', '~> 5.6'
6+
7+
#gem 'puma', '~> 5.6'
8+
gem 'passenger'
9+
710
# gem 'bootsnap', require: false
811
gem 'sprockets', '~> 4.2.0'
912
gem 'terser'

Gemfile.lock

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1493,6 +1493,10 @@ GEM
14931493
terrapin (~> 0.6.0)
14941494
paranoia (2.6.1)
14951495
activerecord (>= 5.1, < 7.1)
1496+
passenger (6.0.23)
1497+
rack (>= 1.6.13)
1498+
rackup
1499+
rake (>= 12.3.3)
14961500
paypal-checkout-sdk (1.0.4)
14971501
paypalhttp (~> 1.0.1)
14981502
paypal_client (0.4.1)
@@ -1520,6 +1524,9 @@ GEM
15201524
rack
15211525
rack-test (2.1.0)
15221526
rack (>= 1.3)
1527+
rackup (1.0.1)
1528+
rack (< 3)
1529+
webrick
15231530
rails (6.1.7.2)
15241531
actioncable (= 6.1.7.2)
15251532
actionmailbox (= 6.1.7.2)
@@ -1675,6 +1682,7 @@ GEM
16751682
rack-proxy (>= 0.6.1)
16761683
railties (>= 5.2)
16771684
semantic_range (>= 2.3.0)
1685+
webrick (1.9.1)
16781686
websocket (1.2.9)
16791687
websocket-client-simple (0.3.0)
16801688
event_emitter
@@ -1729,11 +1737,11 @@ DEPENDENCIES
17291737
onebox!
17301738
paperclip
17311739
paranoia
1740+
passenger
17321741
paypal-checkout-sdk
17331742
paypal_client
17341743
pg (~> 1.5)
17351744
pry
1736-
puma (~> 5.6)
17371745
puma-heroku
17381746
rack-mini-profiler
17391747
rails (~> 6.1)

config/initializers/thredded.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ def set_navbar_actions
216216
@navbar_actions << {
217217
label: 'Discussions',
218218
href: discussions_link,
219-
class: ForumsLinkbuilderService.is_discussions_page?(request.env['REQUEST_PATH']) ? 'active' : nil
219+
class: ForumsLinkbuilderService.is_discussions_page?(request.env['REQUEST_PATH'] || request.fullpath) ? 'active' : nil
220220
}
221221
end
222222

@@ -238,7 +238,7 @@ def set_sidenav_expansion
238238
private
239239

240240
def related_content_type
241-
current_path = request.env['REQUEST_PATH']
241+
current_path = request.env['REQUEST_PATH'] || request.fullpath
242242
match = ForumsLinkbuilderService.content_to_url_map.detect { |key, base_url| current_path.start_with?(base_url) }
243243

244244
if match

yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2052,9 +2052,9 @@ caniuse-api@^3.0.0:
20522052
lodash.uniq "^4.5.0"
20532053

20542054
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001449:
2055-
version "1.0.30001452"
2056-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001452.tgz#dff7b8bb834b3a91808f0a9ff0453abb1fbba02a"
2057-
integrity sha512-Lkp0vFjMkBB3GTpLR8zk4NwW5EdRdnitwYJHDOOKIU85x4ckYCPQ+9WlVvSVClHxVReefkUMtWZH2l9KGlD51w==
2055+
version "1.0.30001695"
2056+
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001695.tgz"
2057+
integrity sha512-vHyLade6wTgI2u1ec3WQBxv+2BrTERV28UXQu9LO6lZ9pYeMk34vjXFLOxo1A4UBA8XTL4njRQZdno/yYaSmWw==
20582058

20592059
case-sensitive-paths-webpack-plugin@^2.4.0:
20602060
version "2.4.0"

0 commit comments

Comments
 (0)