This is an automated email from the ASF dual-hosted git repository. rubys pushed a commit to branch master in repository https://git-dual.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push: new 4335548 prep for separate responses depending on icla info 4335548 is described below commit 4335548b587178716d04d521ab0964b5fa5bfd89 Author: Sam Ruby <ru...@intertwingly.net> AuthorDate: Mon Sep 19 13:45:31 2016 -0400 prep for separate responses depending on icla info --- www/secmail/templates/icla-account-requested.erb | 13 +++++++++++++ www/secmail/templates/icla-pmc-notified.erb | 13 +++++++++++++ www/secmail/views/actions/icla.json.rb | 11 ++++++++++- 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/www/secmail/templates/icla-account-requested.erb b/www/secmail/templates/icla-account-requested.erb new file mode 100644 index 0000000..ef8d367 --- /dev/null +++ b/www/secmail/templates/icla-account-requested.erb @@ -0,0 +1,13 @@ +Dear <%= @pubname %>, + +This message acknowledges receipt of your ICLA, which has been filed in the Apache Software Foundation records. + +If you have been invited as a committer, please advise the project PMC that your ICLA has been filed. + +If you have not been invited, please refer to http://www.apache.org/foundation/how-it-works.html#developers +for more information about roles at Apache. + +Warm Regards, + +<%= @sig %> + diff --git a/www/secmail/templates/icla-pmc-notified.erb b/www/secmail/templates/icla-pmc-notified.erb new file mode 100644 index 0000000..ef8d367 --- /dev/null +++ b/www/secmail/templates/icla-pmc-notified.erb @@ -0,0 +1,13 @@ +Dear <%= @pubname %>, + +This message acknowledges receipt of your ICLA, which has been filed in the Apache Software Foundation records. + +If you have been invited as a committer, please advise the project PMC that your ICLA has been filed. + +If you have not been invited, please refer to http://www.apache.org/foundation/how-it-works.html#developers +for more information about roles at Apache. + +Warm Regards, + +<%= @sig %> + diff --git a/www/secmail/views/actions/icla.json.rb b/www/secmail/views/actions/icla.json.rb index 844e2eb..e5c643a 100644 --- a/www/secmail/views/actions/icla.json.rb +++ b/www/secmail/views/actions/icla.json.rb @@ -111,6 +111,15 @@ end # send confirmation email task "email #@email" do + # chose reply based on whether or not the project/userid info was provided + if @user + reply = 'icla-account-requested.erb' + elsif @product + reply = 'icla-pmc-notified.erb' + else + reply = 'icla.erb' + end + # build mail from template mail = message.reply( from: @from, @@ -120,7 +129,7 @@ task "email #@email" do ("private@#{pmc.mail_list}.apache.org" if pmc), # copy pmc (podling.private_mail_list if podling) # copy podling ], - body: template('icla.erb') + body: template(reply) ) # echo email -- To stop receiving notification emails like this one, please contact ['"commits@whimsical.apache.org" <commits@whimsical.apache.org>'].