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 2018/05/05 18:55:43 UTC
[whimsy] 03/05: Merge branch 'master' of github.com:apache/whimsy
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
commit c5ddb2cd22439bc11f66a33911193c5b939d7ea0
Merge: d52a186 9ba7a1b
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Wed May 2 14:13:39 2018 -0400
Merge branch 'master' of github.com:apache/whimsy
Rakefile | 8 ++++++++
lib/whimsy/asf/board.rb | 4 ++--
lib/whimsy/asf/committee.rb | 23 ++++++++++++++++++----
lib/whimsy/asf/icla.rb | 12 +++++------
lib/whimsy/asf/mail.rb | 4 ++--
lib/whimsy/asf/member.rb | 12 +++++------
lib/whimsy/asf/nominees.rb | 4 ++--
lib/whimsy/asf/orgchart.rb | 6 +++---
lib/whimsy/asf/podling.rb | 16 +++++++--------
lib/whimsy/asf/site.rb | 6 +++---
lib/whimsy/asf/svn.rb | 18 +++++++++++++++--
lib/whimsy/asf/watch.rb | 4 ++--
repository.yml | 4 +++-
tools/agenda_summary.rb | 2 +-
tools/iclasort.rb | 2 +-
tools/membersort.rb | 2 +-
tools/migrate_podlings.rb | 4 ++--
tools/proxyhelper.rb | 6 +++---
tools/site-scan.rb | 4 ++--
www/apmail/mods.cgi | 2 +-
www/board/agenda/bin/remind-cronjob.rb | 4 ++--
www/board/agenda/daemon/channel.rb | 2 +-
www/board/agenda/main.rb | 2 +-
www/board/agenda/models/comments.rb | 2 +-
.../agenda/views/actions/posted-reports.json.rb | 2 +-
www/board/agenda/views/actions/publish.json.rb | 6 +++---
www/board/agenda/views/actions/todos.json.rb | 10 +++++-----
www/board/agenda/views/committers_report.text.rb | 8 ++++----
www/board/agenda/views/pages/index.js.rb | 11 ++++++++++-
www/board/agenda/views/sw.js.rb | 2 +-
www/board/missing-reports.cgi | 2 +-
www/board/posted-reports.cgi | 2 +-
www/board/publish_minutes.cgi | 2 +-
www/brand/list.cgi | 4 ++--
www/committers/testauth.cgi | 2 +-
www/committers/tm-report.cgi | 2 +-
www/events/past.cgi | 2 +-
www/incubator/moderators.cgi | 2 +-
www/incubator/signoff.cgi | 6 +++---
www/members/attendance-xcheck.cgi | 6 +++---
www/members/board-attend.cgi | 2 +-
www/members/inactive.cgi | 8 ++++----
www/members/nominations.cgi | 6 +++---
www/members/non-participants.cgi | 4 ++--
www/members/proxy.cgi | 16 +++++++--------
www/members/watch.cgi | 14 ++++++-------
www/members/whatif.cgi | 4 ++--
www/officers/acreq.cgi | 8 ++++----
www/officers/board-stats.cgi | 10 +++++-----
www/officers/mlreq.cgi | 4 ++--
www/roster/main.rb | 6 +++---
www/roster/models/committee.rb | 8 ++++----
www/roster/models/committer.rb | 4 ++--
www/roster/models/orgchart.rb | 6 +++---
www/roster/public_podlings.rb | 4 ++--
www/roster/views/actions/fullname.json.rb | 2 +-
www/roster/views/actions/memstat.json.rb | 2 +-
www/roster/views/actions/memtext.json.rb | 2 +-
www/secretary/icla-lint.cgi | 4 ++--
www/secretary/iclasort.rb | 2 +-
www/secretary/response-time.cgi | 2 +-
www/secretary/workbench/models/message.rb | 11 +++++++++++
www/secretary/workbench/server.rb | 19 ++++++++++++------
www/secretary/workbench/views/actions/ccla.json.rb | 2 +-
.../workbench/views/actions/grant.json.rb | 2 +-
www/secretary/workbench/views/actions/icla.json.rb | 2 +-
.../workbench/views/actions/icla2.json.rb | 4 ++--
.../workbench/views/actions/memapp.json.rb | 4 ++--
www/secretary/workbench/views/memapp.json.rb | 8 ++++++--
www/secretary/workbench/views/parts.html.rb | 3 ++-
www/secretary/workbench/views/parts.js.rb | 10 ++++++----
71 files changed, 239 insertions(+), 166 deletions(-)
--
To stop receiving notification emails like this one, please contact
rubys@apache.org.