whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject [whimsy] branch master updated: Add detail to committer/PMC/PPMC invitation email
Date Sun, 12 Nov 2017 18:02:16 GMT
This is an automated email from the ASF dual-hosted git repository.

clr 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 9fcccca  Add detail to committer/PMC/PPMC invitation email
9fcccca is described below

commit 9fcccca78d1e6e4f38f77e991184f37daa99226e
Author: Craig L Russell <craig.russell@oracle.com>
AuthorDate: Sun Nov 12 10:02:08 2017 -0800

    Add detail to committer/PMC/PPMC invitation email
---
 www/project/icla/main.rb                        |  2 +-
 www/project/icla/views/actions/validate.json.rb | 24 ++++++++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/www/project/icla/main.rb b/www/project/icla/main.rb
index bd710ac..4ba16fb 100755
--- a/www/project/icla/main.rb
+++ b/www/project/icla/main.rb
@@ -30,7 +30,7 @@ get '/invite' do
     .map(&:name).sort
 
   # allow user to invite contributors for PMCs of which the user is a member,
-  # or for podlings if the user is a member of the IPMC.
+  # or for podlings if the user is a member of the PPMC.
   user = ASF::Person.find(env.user)
   committees = user.committees.map(&:name)
   ipmc = committees.include?('incubator')
diff --git a/www/project/icla/views/actions/validate.json.rb b/www/project/icla/views/actions/validate.json.rb
index d91116a..866ee51 100644
--- a/www/project/icla/views/actions/validate.json.rb
+++ b/www/project/icla/views/actions/validate.json.rb
@@ -22,6 +22,9 @@ prototype_committer =
 "Congratulations! The #{pmc.name} #{pmc_type} hereby offers you committer privileges
 to the #{pmc.name} project.
 
+You can read more about what the expectations are for committers here:
+http://www.apache.org/dev/committers.html#committer-responsibilities
+
 These privileges are offered on the understanding that you'll use them
 reasonably and with common sense. We like to work on trust rather than
 unnecessary constraints.
@@ -42,9 +45,17 @@ address only.
 "
 
 prototype_pmc =
-"You are also invited to become a member of the #{pmc.name} #{pmc_type}.
-Being a #{pmc_type} member enables you to help guide the direction of the project.
-If you accept, you will have binding votes on releases and new committers.
+"You are also invited to become a member of the #{pmc.name} PMC.
+Being a PMC member enables you to help guide the direction of the project.
+You can read more about what the expectations are for PMC members here:
+http://www.apache.org/dev/pmc.html#audience
+"
+
+prototype_ppmc =
+"You are also invited to become a member of the #{pmc.name} PPMC.
+Being a PPMC member enables you to help guide the direction of the project.
+You can read more about what the expectations are for PPMC members here:
+https://incubator.apache.org/guides/ppmc.html
 "
 
 # validate email address
@@ -97,9 +108,10 @@ link = "#{scheme}://#{env['HTTP_HOST']}#{path}"
 _token token
 _invitation %{Dear #{@iclaname},
 
-#{prototype_contributor if @votelink.empty?}
-#{prototype_committer if not @votelink.empty?}
-#{prototype_pmc if @noticelink}
+#{prototype_contributor if @votelink.empty?}\
+#{prototype_committer if not @votelink.empty?}\
+#{prototype_pmc if @noticelink && pmc_type = 'PMC'}\
+#{prototype_ppmc if @noticelink && pmc_type = 'PPMC'}
 Click on this link to accept:
 #{link}
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <commits@whimsical.apache.org>'].

Mime
View raw message