This is an automated email from the ASF dual-hosted git repository.
sebb 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 2efd3ea4 misc: remove unneeded trailing whitespace (#205)
2efd3ea4 is described below
commit 2efd3ea4092b9271b59d484a6dd927662d89f3cb
Author: John Bampton <[email protected]>
AuthorDate: Thu Feb 22 21:52:52 2024 +1000
misc: remove unneeded trailing whitespace (#205)
---
config/bash_aliases .template | 2 +-
docker-config/maintenance_banner.lua | 2 +-
www/board/agenda/Dockerfile | 2 +-
www/board/agenda/config.ru | 2 +-
www/members/inactive.cgi | 6 +++---
www/members/invitations.cgi | 6 +++---
www/members/mailing_lists.cgi | 4 ++--
www/members/proxy.cgi | 4 ++--
www/racktest/config.ru | 2 +-
www/roster/views/AAREADME.txt | 2 +-
www/secretary/upload_file.cgi | 2 +-
11 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/config/bash_aliases .template b/config/bash_aliases .template
index f4dac713..d90e124f 100644
--- a/config/bash_aliases .template
+++ b/config/bash_aliases .template
@@ -1,4 +1,4 @@
-# Template file for .bash_aliases
+# Template file for .bash_aliases
# Needs to be present in the parent directory of the workspace
# Note: logs can be stored on the host; create the directory apache2_logs
diff --git a/docker-config/maintenance_banner.lua
b/docker-config/maintenance_banner.lua
index f537c918..0f356137 100644
--- a/docker-config/maintenance_banner.lua
+++ b/docker-config/maintenance_banner.lua
@@ -12,7 +12,7 @@
For simplicity, we add the banner to the start of the page.
This is not really valid HTML, but seems to work in most cases, and avoids
having to find a better
- place to insert it.
+ place to insert it.
]]--
diff --git a/www/board/agenda/Dockerfile b/www/board/agenda/Dockerfile
index 5754e6f5..a460fe60 100644
--- a/www/board/agenda/Dockerfile
+++ b/www/board/agenda/Dockerfile
@@ -51,7 +51,7 @@ RUN apt-get autoremove -y && \
# Whimsy Agenda
RUN gem install bundler
-ADD Gemfile /home/agenda/
+ADD Gemfile /home/agenda/
WORKDIR /home/agenda
RUN bundle install
RUN ruby -r whimsy/asf -e "ASF::LDAP.configure"
diff --git a/www/board/agenda/config.ru b/www/board/agenda/config.ru
index 9878fb15..73dd89f0 100644
--- a/www/board/agenda/config.ru
+++ b/www/board/agenda/config.ru
@@ -4,7 +4,7 @@ require File.expand_path('../main.rb', __FILE__)
use ASF::Auth::MembersAndOfficers do |env|
# allow access to bootstrap related content
- if
+ if
env['PATH_INFO'] =~ %r{^/(app|sw)\.js(\.map)?$} or
env['PATH_INFO'] =~ %r{\.js\.rb?$} or
env['PATH_INFO'] =~ %r{^/stylesheets/.*\.css\$} or
diff --git a/www/members/inactive.cgi b/www/members/inactive.cgi
index 88a76467..0609bb91 100755
--- a/www/members/inactive.cgi
+++ b/www/members/inactive.cgi
@@ -98,7 +98,7 @@ _html do
Unfortunately this was only discovered after an email was sent to
members.
Apologies to those of you who received an email in error.
}
-
+
end
}
) do
@@ -178,8 +178,8 @@ _html do
_p_ %{
If you haven't attended or voted in meetings recently, please
consider participating, at
least by proxy, in the upcoming membership meeting. Assigning a
proxy does NOT prevent
- you from attending meetings. Normally, your proxy will just be at
the meeting to
- mark your attendance. You will still get any vote emails
yourself. Remember that
+ you from attending meetings. Normally, your proxy will just be at
the meeting to
+ mark your attendance. You will still get any vote emails
yourself. Remember that
voting at a meeting also counts for attendance.
}
end
diff --git a/www/members/invitations.cgi b/www/members/invitations.cgi
index 1a7627b9..e4f80427 100755
--- a/www/members/invitations.cgi
+++ b/www/members/invitations.cgi
@@ -16,7 +16,7 @@ def setup_data
# which entries are shown as uninvited; get availid and name
notinvited = {}
notapplied = []
- ASF::MeetingUtil.parse_memapp(memappfile).filter_map do |a|
+ ASF::MeetingUtil.parse_memapp(memappfile).filter_map do |a|
if a.first == 'no'
notinvited[a[-2]] = {name: a[-1]}
elsif a[1..-3].any? {|e| e == 'no'} # any no after first?
@@ -27,7 +27,7 @@ def setup_data
# find relevant email files (exclude ones before the meeting)
yyyymm = File.basename(File.dirname(memappfile))[0..5]
yamls = Dir[File.join(MAIL_DIR, '2?????.yaml')].select {|n| File.basename(n,
'yaml') >= yyyymm }
-
+
# now find invitations and replies
invites = {emails: {}, names: {}}
replies = {emails: {}, names: {}}
@@ -114,7 +114,7 @@ _html do
_th 'reply seen?'
_th 'nominator(s)'
end
-
+
notinvited.each do |id, v|
_tr_ do
_td id
diff --git a/www/members/mailing_lists.cgi b/www/members/mailing_lists.cgi
index 7d4544de..ccd6f08e 100755
--- a/www/members/mailing_lists.cgi
+++ b/www/members/mailing_lists.cgi
@@ -130,7 +130,7 @@ _html do
_ mu
_ type(mu)
end
- count = mod_counts[lad]
+ count = mod_counts[lad]
if !flags.include?('s') and %w{subonly open}.include? type(mu)
# ensure unmoderated lists are not penalised for having few
moderators
_td data_sort_value: count+100 do
@@ -139,7 +139,7 @@ _html do
else
if count.to_i < 3
_td class: 'bg-danger' do
- _ count
+ _ count
end
else
_td count
diff --git a/www/members/proxy.cgi b/www/members/proxy.cgi
index 4c98b744..16b20767 100755
--- a/www/members/proxy.cgi
+++ b/www/members/proxy.cgi
@@ -69,7 +69,7 @@ def emit_form(cur_mtg_dir, meeting, volunteers, disabled)
rescue StandardError
secretary_id = ''
end
-
+
help, copypasta = ASF::MeetingUtil.is_user_proxied(cur_mtg_dir, $USER)
user_is_proxy = help && copypasta
_whimsy_panel(user_is_proxy ? "You Are Proxying For Others" : "Select A
Proxy For Upcoming Meeting", style: 'panel-success') do
@@ -114,7 +114,7 @@ def emit_form(cur_mtg_dir, meeting, volunteers, disabled)
_p %{
(* The meeting will be postponed if the Chair and/or Secretary
cannot attend)
}
-
+
# Fetch LDAP
ldap_members = ASF.members
diff --git a/www/racktest/config.ru b/www/racktest/config.ru
index eb5f72f7..9a58225c 100644
--- a/www/racktest/config.ru
+++ b/www/racktest/config.ru
@@ -15,7 +15,7 @@ run lambda {|env|
gem_version: Gem::VERSION,
env: env
}
-
+
[ 200, {'Content-Type' => 'text/plain'}, [JSON.pretty_generate(data)] ]
rescue => e
[ 500, {'Content-Type' => 'text/plain'}, [e.to_s] ]
diff --git a/www/roster/views/AAREADME.txt b/www/roster/views/AAREADME.txt
index 07907d91..dbf17b5f 100644
--- a/www/roster/views/AAREADME.txt
+++ b/www/roster/views/AAREADME.txt
@@ -1,4 +1,4 @@
-The contents of the views directory *except* for the
+The contents of the views directory *except* for the
'actions' subdirectory are run on the client.
To factor out code from actions, it needs to be placed
diff --git a/www/secretary/upload_file.cgi b/www/secretary/upload_file.cgi
index cd7750ab..5b74c22b 100755
--- a/www/secretary/upload_file.cgi
+++ b/www/secretary/upload_file.cgi
@@ -14,7 +14,7 @@ _html do
helpblock: -> {
_p do
_ 'Upload a new file to SVN using your credentials'
- _br
+ _br
_ 'The file will have the same name in SVN, so rename it locally first
if necessary'
end
}
