You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by ru...@apache.org on 2022/04/14 20:06:37 UTC
[whimsy] branch master updated: make roster and secretary workbench ready for Ruby 3.1 and Node 17
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new e2d5462a make roster and secretary workbench ready for Ruby 3.1 and Node 17
e2d5462a is described below
commit e2d5462a7d772afe63b4d08489ee9894210c0453
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Thu Apr 14 16:05:52 2022 -0400
make roster and secretary workbench ready for Ruby 3.1 and Node 17
---
www/roster/Gemfile | 2 ++
www/roster/views/committee.html.rb | 2 +-
www/roster/views/committer.html.rb | 2 +-
www/roster/views/committers.html.rb | 2 +-
www/roster/views/group.html.rb | 2 +-
www/roster/views/iclas.html.rb | 2 +-
www/roster/views/nonpmc.html.rb | 2 +-
www/roster/views/ppmc.html.rb | 2 +-
www/roster/views/ppmc_new.html.rb | 2 +-
www/secretary/workbench/Gemfile | 2 ++
www/secretary/workbench/views/index.html.rb | 2 +-
www/secretary/workbench/views/parts.html.rb | 2 +-
12 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/www/roster/Gemfile b/www/roster/Gemfile
index 7b3bd898..c531d98f 100644
--- a/www/roster/Gemfile
+++ b/www/roster/Gemfile
@@ -25,3 +25,5 @@ group :development do
gem 'passenger'
gem 'listen'
end
+
+gem 'net-smtp', require: false # for Ruby 3.1
diff --git a/www/roster/views/committee.html.rb b/www/roster/views/committee.html.rb
index 7719e058..2adf4da4 100644
--- a/www/roster/views/committee.html.rb
+++ b/www/roster/views/committee.html.rb
@@ -19,7 +19,7 @@ _html do
end
_script src: "app.js?#{appmtime}"
- _.render '#main' do
+ _.render '#main', timeout: 1 do
_PMC committee: @committee, auth: @auth
end
end
diff --git a/www/roster/views/committer.html.rb b/www/roster/views/committer.html.rb
index 22dd36fc..4e174751 100644
--- a/www/roster/views/committer.html.rb
+++ b/www/roster/views/committer.html.rb
@@ -18,7 +18,7 @@ _html do
end
_script src: "app.js?#{appmtime}"
- _.render '#main' do
+ _.render '#main', timeout: 1 do
_Person committer: @committer, auth: @auth
end
end
diff --git a/www/roster/views/committers.html.rb b/www/roster/views/committers.html.rb
index bb2bc113..6be0c119 100644
--- a/www/roster/views/committers.html.rb
+++ b/www/roster/views/committers.html.rb
@@ -22,7 +22,7 @@ _html do
) do
_div_.main!
_script src: "app.js?#{appmtime}"
- _.render '#main' do
+ _.render '#main', timeout: 1 do
_CommitterSearch notinavail: @notinavail,
# This ends with '/'
iclapath: @iclapath
diff --git a/www/roster/views/group.html.rb b/www/roster/views/group.html.rb
index 85555f19..57b7029c 100644
--- a/www/roster/views/group.html.rb
+++ b/www/roster/views/group.html.rb
@@ -19,7 +19,7 @@ _html do
end
_script src: "app.js?#{appmtime}"
- _.render '#main' do
+ _.render '#main', timeout: 1 do
_Group group: @group, auth: @auth
end
end
diff --git a/www/roster/views/iclas.html.rb b/www/roster/views/iclas.html.rb
index 75e058e0..135db1ab 100644
--- a/www/roster/views/iclas.html.rb
+++ b/www/roster/views/iclas.html.rb
@@ -14,7 +14,7 @@ _html do
) do
_div_.main!
_script src: "app.js?#{appmtime}"
- _.render '#main' do
+ _.render '#main', timeout: 1 do
_IclaSearch iclapath: @iclapath
end
end
diff --git a/www/roster/views/nonpmc.html.rb b/www/roster/views/nonpmc.html.rb
index 5439afa4..34abf797 100644
--- a/www/roster/views/nonpmc.html.rb
+++ b/www/roster/views/nonpmc.html.rb
@@ -19,7 +19,7 @@ _html do
end
_script src: "app.js?#{appmtime}"
- _.render '#main' do
+ _.render '#main', timeout: 1 do
_NonPMC nonpmc: @nonpmc, auth: @auth
end
end
diff --git a/www/roster/views/ppmc.html.rb b/www/roster/views/ppmc.html.rb
index 5cae4941..234f0596 100644
--- a/www/roster/views/ppmc.html.rb
+++ b/www/roster/views/ppmc.html.rb
@@ -17,7 +17,7 @@ _html do
) do
_div_.main!
_script src: "app.js?#{appmtime}"
- _.render '#main' do
+ _.render '#main', timeout: 1 do
_PPMC ppmc: @ppmc, auth: @auth
end
end
diff --git a/www/roster/views/ppmc_new.html.rb b/www/roster/views/ppmc_new.html.rb
index e7050f3f..452d63f3 100644
--- a/www/roster/views/ppmc_new.html.rb
+++ b/www/roster/views/ppmc_new.html.rb
@@ -19,7 +19,7 @@ _html do
end
_script src: "app.js?#{appmtime}"
- _.render '#main' do
+ _.render '#main', timeout: 1 do
_PPMCNew auth: @auth, pmcsAndBoard: @pmcsAndBoard,
officersAndMemers: @officersAndMembers, ipmc: @ipmc
end
diff --git a/www/secretary/workbench/Gemfile b/www/secretary/workbench/Gemfile
index d245ff0e..c327a06d 100644
--- a/www/secretary/workbench/Gemfile
+++ b/www/secretary/workbench/Gemfile
@@ -22,3 +22,5 @@ gem 'execjs'
gem 'listen'
gem 'escape'
gem 'pdf-reader'
+
+gem 'net-smtp', require: false # for Ruby 3.1
diff --git a/www/secretary/workbench/views/index.html.rb b/www/secretary/workbench/views/index.html.rb
index 2e5a5e3c..b1bcf06b 100644
--- a/www/secretary/workbench/views/index.html.rb
+++ b/www/secretary/workbench/views/index.html.rb
@@ -17,7 +17,7 @@ _html do
_div_.index!
_script src: "./app.js?#{@appmtime}"
- _.render '#index' do
+ _.render '#index', timeout: 1 do
_Index mbox: @mbox, messages: @messages
end
end
diff --git a/www/secretary/workbench/views/parts.html.rb b/www/secretary/workbench/views/parts.html.rb
index 2d9ca125..cf3dbac3 100644
--- a/www/secretary/workbench/views/parts.html.rb
+++ b/www/secretary/workbench/views/parts.html.rb
@@ -92,7 +92,7 @@ _html do
end
_script src: "../../app.js?#{@appmtime}"
- _.render '#parts' do
+ _.render '#parts', timeout: 1 do
_Parts attachments: @attachments, headers: @headers, projects: @projects,
meeting: @meeting
end