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 9187b9a Detab
9187b9a is described below
commit 9187b9a00b4c899700502a920cfbd0bad0ece79d
Author: Sebb <[email protected]>
AuthorDate: Tue Sep 22 20:11:05 2020 +0100
Detab
---
lib/whimsy/asf/svn.rb | 2 +-
tools/collate_minutes.rb | 10 +++++-----
tools/ponyapi.rb | 4 ++--
www/committers/config_info.cgi | 2 +-
www/roster/models/committer.rb | 16 ++++++++--------
www/secretary/workbench/views/actions/icla2.json.rb | 6 +++---
6 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/lib/whimsy/asf/svn.rb b/lib/whimsy/asf/svn.rb
index 3d1fba0..e0824e0 100644
--- a/lib/whimsy/asf/svn.rb
+++ b/lib/whimsy/asf/svn.rb
@@ -141,7 +141,7 @@ module ASF
end
# fetch a repository URL by name - abort if not found
- # Includes aliases
+ # Includes aliases
def self.svnurl!(name)
entry = self.svnurl(name)
unless entry
diff --git a/tools/collate_minutes.rb b/tools/collate_minutes.rb
index f4e2349..5a86751 100755
--- a/tools/collate_minutes.rb
+++ b/tools/collate_minutes.rb
@@ -488,10 +488,10 @@ seen={}
(?=\n\s{3,5}\d?[0-9A-Z]\.\s|\z) # next section
/mx).each do |attach,title,text|
if title.include? "\n" and title.length > 120
- title = title.split("\n")
- text = title[1..-1].join("\n") + "\n" + text
- title = title[0]
- end
+ title = title.split("\n")
+ text = title[1..-1].join("\n") + "\n" + text
+ title = title[0]
+ end
report = OpenStruct.new
report.title = title.gsub(/\s+/, ' ')
@@ -516,7 +516,7 @@ seen={}
report.attach = '.' + pmc
end
end
- end
+ end
pending[title] = report
end
diff --git a/tools/ponyapi.rb b/tools/ponyapi.rb
index 5810ffa..889e30e 100755
--- a/tools/ponyapi.rb
+++ b/tools/ponyapi.rb
@@ -34,11 +34,11 @@ module PonyAPI
# no real point sorting unless writing the file
if sort_list
if recurse_sort
- lists.each do |k,v|
+ lists.each do |k, v|
lists[k] = Hash[v.sort]
end
end
- lists = Hash[lists.sort]
+ lists = Hash[lists.sort]
end
openfile(dir, 'lists.json') do |f|
begin
diff --git a/www/committers/config_info.cgi b/www/committers/config_info.cgi
index 577f317..b841a9e 100755
--- a/www/committers/config_info.cgi
+++ b/www/committers/config_info.cgi
@@ -11,5 +11,5 @@ cfg = ASF::Config.instance_variable_get(:@config)
cfg.each do |k,v|
- puts "%s: %s" % [k,v]
+ puts "%s: %s" % [k,v]
end
\ No newline at end of file
diff --git a/www/roster/models/committer.rb b/www/roster/models/committer.rb
index d20f76b..e211915 100644
--- a/www/roster/models/committer.rb
+++ b/www/roster/models/committer.rb
@@ -221,16 +221,16 @@ class Committer
end
end
- response[:pmcs] = []
- response[:nonpmcs] = []
+ response[:pmcs] = []
+ response[:nonpmcs] = []
- pmcs.each do |pmc|
- response[:pmcs] << pmc.name if pmc.roster.include?(person.id)
- response[:chairOf] << pmc.name if pmc.chairs.map{|ch|
ch[:id]}.include?(person.id)
- end
- response[:pmcs].sort!
+ pmcs.each do |pmc|
+ response[:pmcs] << pmc.name if pmc.roster.include?(person.id)
+ response[:chairOf] << pmc.name if pmc.chairs.map{|ch|
ch[:id]}.include?(person.id)
+ end
+ response[:pmcs].sort!
- response[:nonPMCchairOf] = [] # use separate list to avoid
missing pmc-chair warnings
+ response[:nonPMCchairOf] = [] # use separate list to avoid missing
pmc-chair warnings
nonpmcs = ASF::Committee.nonpmcs
nonpmcs.each do |nonpmc|
response[:nonpmcs] << nonpmc.name if nonpmc.roster.include?(person.id)
diff --git a/www/secretary/workbench/views/actions/icla2.json.rb
b/www/secretary/workbench/views/actions/icla2.json.rb
index 3facafa..3ee713d 100644
--- a/www/secretary/workbench/views/actions/icla2.json.rb
+++ b/www/secretary/workbench/views/actions/icla2.json.rb
@@ -218,15 +218,15 @@ if @id != 'notinavail'
ldap = ASF.init_ldap(true)
ldap.bind("uid=#{env.user.untaint},ou=people,dc=apache,dc=org",
- env.password.untaint)
+ env.password.untaint)
ldap.modify person.dn, [ASF::Base.mod_replace('mail', @email.strip)]
log = ["LDAP modify: #{ldap.err2string(ldap.err)} (#{ldap.err})"]
if ldap.err == 0
- _transcript log
+ _transcript log
else
- _backtrace log
+ _backtrace log
end
ldap.unbind
