From 03abd9284be5961dc31eb1c5016786d972b1c160 Mon Sep 17 00:00:00 2001 From: nikolaTrichkovski Date: Mon, 22 Sep 2025 14:20:43 +0200 Subject: [PATCH 01/12] add gdpr data_retention_notice template and mailer for all the three emails --- lib/travis/addons/gdpr/mailer/gdpr_mailer.rb | 35 +++++++ .../data_retention_notice.html.erb | 99 +++++++++++++++++++ lib/travis/addons/gdpr/task.rb | 6 ++ 3 files changed, 140 insertions(+) create mode 100644 lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_retention_notice.html.erb diff --git a/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb b/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb index 5bbd436f..924f5234 100644 --- a/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb +++ b/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb @@ -24,6 +24,41 @@ def purge(receivers, request_date) mail(from: travis_email, to: receivers, subject: 'Your data was purged', template_path: 'gdpr_mailer') end + # Retention policy notifications + + def data_retention_notice(receivers, owner, retention) + @owner = owner + @retention = retention + mail( + from: travis_email, + to: receivers, + subject: "Notice: Data Stored at Travis CI Older Than #{retention[:months]} Months", + template_path: 'gdpr_mailer' + ) + end + + def upcoming_data_deletion_notice(receivers, owner, retention) + @owner = owner + @retention = retention + mail( + from: travis_email, + to: receivers, + subject: "Reminder: Scheduled Deletion of Data Older Than #{retention[:months]} Months in 3 Days", + template_path: 'gdpr_mailer' + ) + end + + def data_deletion_confirmation(receivers, owner, retention) + @owner = owner + @retention = retention + mail( + from: travis_email, + to: receivers, + subject: "Confirmation: Data Older Than #{retention[:months]} Months Was Deleted", + template_path: 'gdpr_mailer' + ) + end + private def travis_email diff --git a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_retention_notice.html.erb b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_retention_notice.html.erb new file mode 100644 index 00000000..3d150ea6 --- /dev/null +++ b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_retention_notice.html.erb @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + +
+ + + + +
+ + + + + + + + + + + + + +
+ Travis CI Logo +
+

Notice: Data Stored at Travis CI Older Than <%= @retention[:months] %> Months

+
+

Hello <%= @owner[:name] %>,

+

This is an automated notification from Travis CI.

+

We have detected that some of your stored data is older than <%= @retention[:months] %> months. This may include (but is not limited to):

+
    +
  • Cached artifacts
    • +
  • Build logs
    • +
  • Customized images
    • +
+

Please review and, if necessary, back up or remove this data to ensure continued compliance with storage policies and to free up space for future.

+

If no action is taken, older data may be subject to automatic removal in accordance with our retention policy (within next <%= @retention[:days_until_deletion] %> days).

+

For details on managing stored data, please refer to our documentation: + Documentation +

+
+

Thank you for your attention,

+

The Travis CI Support Team

+
+ + + + + + + + + + + +
+
+ + diff --git a/lib/travis/addons/gdpr/task.rb b/lib/travis/addons/gdpr/task.rb index 6f1e40be..c37a5283 100644 --- a/lib/travis/addons/gdpr/task.rb +++ b/lib/travis/addons/gdpr/task.rb @@ -18,6 +18,12 @@ def send_email Mailer::GdprMailer.support_export(recipients, params.fetch(:user_name), params.fetch(:url)).deliver when 'purge' Mailer::GdprMailer.purge(recipients, params.fetch(:request_date)).deliver + when 'data_retention_notice' + Mailer::GdprMailer.data_retention_notice(recipients, params.fetch(:owner), params.fetch(:retention)).deliver + when 'upcoming_data_deletion_notice' + Mailer::GdprMailer.upcoming_data_deletion_notice(recipients, params.fetch(:owner), params.fetch(:retention)).deliver + when 'data_deletion_confirmation' + Mailer::GdprMailer.data_deletion_confirmation(recipients, params.fetch(:owner), params.fetch(:retention)).deliver else raise NoMailType, "#{type} is not a valid email type" end From 132d2d5b9423bee347e73f0c8e57755e8b7c2032 Mon Sep 17 00:00:00 2001 From: nikolaTrichkovski Date: Tue, 23 Sep 2025 00:03:24 +0200 Subject: [PATCH 02/12] dynamic days in subject --- lib/travis/addons/gdpr/mailer/gdpr_mailer.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb b/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb index 924f5234..a4dd7e73 100644 --- a/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb +++ b/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb @@ -29,6 +29,9 @@ def purge(receivers, request_date) def data_retention_notice(receivers, owner, retention) @owner = owner @retention = retention + Travis.logger.info("we're sending retention email to #{receivers}, retention: #{retention}") + puts "using puts: we're sending retention email to #{receivers}, retention: #{retention}" + mail( from: travis_email, to: receivers, @@ -40,10 +43,11 @@ def data_retention_notice(receivers, owner, retention) def upcoming_data_deletion_notice(receivers, owner, retention) @owner = owner @retention = retention + days = (retention[:days_until_deletion]).to_i mail( from: travis_email, to: receivers, - subject: "Reminder: Scheduled Deletion of Data Older Than #{retention[:months]} Months in 3 Days", + subject: "Reminder: Scheduled Deletion of Data Older Than #{retention[:months]} Months in #{days} Days", template_path: 'gdpr_mailer' ) end From 4ea2ca27803db36886d395eeb3eff719c1b94caa Mon Sep 17 00:00:00 2001 From: nikolaTrichkovski Date: Tue, 23 Sep 2025 22:13:31 +0200 Subject: [PATCH 03/12] add data_deletion_confirmation template --- .../data_deletion_confirmation.html.erb | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb diff --git a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb new file mode 100644 index 00000000..6eac84fc --- /dev/null +++ b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + +
+ + + + +
+ + + + + + + + + + + + + +
+ Travis CI Logo +
+

Confirmation: Data Older Than <%= @retention[:months] %> Months Was Deleted

+
+

Hello <%= @owner[:name] %>,

+

This is a confirmation from Travis CI.

+

Data older than <%= @retention[:months] %> months associated with your account has been deleted in accordance with our retention policy.

+

If you have any questions or need further assistance, please contact our support team.

+
+

Thank you,

+

The Travis CI Support Team

+
+ + + + + + + + + + + +
+
+ + From 66e44d61e3f0d7416fe4fb160eb14a3488dd542e Mon Sep 17 00:00:00 2001 From: nikolaTrichkovski Date: Fri, 26 Sep 2025 22:14:44 +0200 Subject: [PATCH 04/12] add upcoming mail template --- lib/travis/addons/gdpr/mailer/gdpr_mailer.rb | 2 +- .../upcoming_data_deletion_notice.html.erb | 100 ++++++++++++++++++ 2 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 lib/travis/addons/gdpr/mailer/views/gdpr_mailer/upcoming_data_deletion_notice.html.erb diff --git a/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb b/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb index a4dd7e73..59e829ec 100644 --- a/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb +++ b/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb @@ -52,7 +52,7 @@ def upcoming_data_deletion_notice(receivers, owner, retention) ) end - def data_deletion_confirmation(receivers, owner, retention) + def data_deletion_confirmation(receivers, owner, retention) # Comes from travis-gdpr @owner = owner @retention = retention mail( diff --git a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/upcoming_data_deletion_notice.html.erb b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/upcoming_data_deletion_notice.html.erb new file mode 100644 index 00000000..1f9ada66 --- /dev/null +++ b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/upcoming_data_deletion_notice.html.erb @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + +
+ + + + +
+ + + + + + + + + + + + + +
+ Travis CI Logo +
+ <% days = (@retention[:days_until_deletion]).to_i %> +

Reminder: Scheduled Deletion of Data Older Than <%= @retention[:months] %> Months in <%= days %> Days

+
+

Hello <%= @owner[:name] %>,

+

This is an automated reminder from Travis CI.

+ <% days_body_label = days == 1 ? 'day' : 'days' %> +

Some of your stored data is older than <%= @retention[:months] %> months and is scheduled for automatic deletion in <%= days %> <%= days_body_label %>. This may include (but is not limited to):

+
    +
  • Cached artifacts
    • +
  • Build logs
    • +
  • Customized images
    • +
+

If you wish to retain this data, please back it up or update it before the scheduled removal date.

+

For guidance on managing stored data, please see our documentation: + Documentation +

+
+

Thank you for helping us maintain a clean and efficient storage environment,

+

The Travis CI Support Team

+
+ + + + + + + + + + + +
+
+ + From 6da597e379d4844c0d76716a7bd0c916b99c8699 Mon Sep 17 00:00:00 2001 From: tonoyansergey-devt Date: Fri, 10 Oct 2025 15:52:53 +0400 Subject: [PATCH 05/12] TBT-428 Correct documentation links --- .../mailer/views/gdpr_mailer/data_retention_notice.html.erb | 2 +- .../views/gdpr_mailer/upcoming_data_deletion_notice.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_retention_notice.html.erb b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_retention_notice.html.erb index 3d150ea6..66936948 100644 --- a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_retention_notice.html.erb +++ b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_retention_notice.html.erb @@ -55,7 +55,7 @@

Please review and, if necessary, back up or remove this data to ensure continued compliance with storage policies and to free up space for future.

If no action is taken, older data may be subject to automatic removal in accordance with our retention policy (within next <%= @retention[:days_until_deletion] %> days).

For details on managing stored data, please refer to our documentation: - Documentation + Documentation

diff --git a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/upcoming_data_deletion_notice.html.erb b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/upcoming_data_deletion_notice.html.erb index 1f9ada66..65f3c1fd 100644 --- a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/upcoming_data_deletion_notice.html.erb +++ b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/upcoming_data_deletion_notice.html.erb @@ -56,7 +56,7 @@

If you wish to retain this data, please back it up or update it before the scheduled removal date.

For guidance on managing stored data, please see our documentation: - Documentation + Documentation

From be0c4bb3ab87a80eb2d0c593af96ad7feccbb8ff Mon Sep 17 00:00:00 2001 From: tonoyansergey-devt Date: Fri, 10 Oct 2025 15:55:32 +0400 Subject: [PATCH 06/12] TBT-428 Remove extra 'The' from email signature --- .../views/gdpr_mailer/data_deletion_confirmation.html.erb | 2 +- .../mailer/views/gdpr_mailer/data_retention_notice.html.erb | 2 +- .../views/gdpr_mailer/upcoming_data_deletion_notice.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb index 6eac84fc..9235d890 100644 --- a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb +++ b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb @@ -53,7 +53,7 @@

Thank you,

-

The Travis CI Support Team

+

Travis CI Support Team

diff --git a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_retention_notice.html.erb b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_retention_notice.html.erb index 66936948..d98d4505 100644 --- a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_retention_notice.html.erb +++ b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_retention_notice.html.erb @@ -62,7 +62,7 @@

Thank you for your attention,

-

The Travis CI Support Team

+

Travis CI Support Team

diff --git a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/upcoming_data_deletion_notice.html.erb b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/upcoming_data_deletion_notice.html.erb index 65f3c1fd..652e5c92 100644 --- a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/upcoming_data_deletion_notice.html.erb +++ b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/upcoming_data_deletion_notice.html.erb @@ -63,7 +63,7 @@

Thank you for helping us maintain a clean and efficient storage environment,

-

The Travis CI Support Team

+

Travis CI Support Team

From 9ca57606333f94c388ac0cfb68b5b1ef218e325f Mon Sep 17 00:00:00 2001 From: nikolaTrichkovski Date: Sun, 12 Oct 2025 07:03:32 +0200 Subject: [PATCH 07/12] remove puts --- lib/travis/addons/gdpr/mailer/gdpr_mailer.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb b/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb index 59e829ec..da1b5afd 100644 --- a/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb +++ b/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb @@ -29,9 +29,6 @@ def purge(receivers, request_date) def data_retention_notice(receivers, owner, retention) @owner = owner @retention = retention - Travis.logger.info("we're sending retention email to #{receivers}, retention: #{retention}") - puts "using puts: we're sending retention email to #{receivers}, retention: #{retention}" - mail( from: travis_email, to: receivers, From 2e77bf70a5ad008f0e54df81988d01f9703873a5 Mon Sep 17 00:00:00 2001 From: tonoyansergey-devt Date: Mon, 13 Oct 2025 03:04:36 +0400 Subject: [PATCH 08/12] TBT-428 Correct deletion email wording and styling --- lib/travis/addons/gdpr/mailer/gdpr_mailer.rb | 2 +- .../data_deletion_confirmation.html.erb | 29 ++++++++++++------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb b/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb index da1b5afd..71969875 100644 --- a/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb +++ b/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb @@ -55,7 +55,7 @@ def data_deletion_confirmation(receivers, owner, retention) # Comes from travis- mail( from: travis_email, to: receivers, - subject: "Confirmation: Data Older Than #{retention[:months]} Months Was Deleted", + subject: "Confirmation: Data Older Than #{retention[:months]} Has Been Removed", template_path: 'gdpr_mailer' ) end diff --git a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb index 9235d890..7152aeff 100644 --- a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb +++ b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb @@ -37,23 +37,32 @@ Travis CI Logo - - -

Confirmation: Data Older Than <%= @retention[:months] %> Months Was Deleted

- -

Hello <%= @owner[:name] %>,

-

This is a confirmation from Travis CI.

+

This is an automated confirmation from Travis CI.

+

As part of our storage retention policy, the following types of data older than <%= @retention[:months] %> months have been permanently removed from your account:

+
    +
  • Cached artifacts
    • +
  • Build logs
    • +
  • Customized images
    • +

Data older than <%= @retention[:months] %> months associated with your account has been deleted in accordance with our retention policy.

-

If you have any questions or need further assistance, please contact our support team.

+

+ No further action is required on your part. +
+ If you have questions about this removal or our retention policy, please refer to our + documentation or contact our support team. +

- -

Thank you,

-

Travis CI Support Team

+ +

+ Thank you for your understanding, +
+ Travis CI Support Team +

From 995b6f673b06cd12a2c99bb13228a16e4d7648a4 Mon Sep 17 00:00:00 2001 From: tonoyansergey-devt Date: Mon, 13 Oct 2025 03:06:37 +0400 Subject: [PATCH 09/12] TBT-428 Correct deletion email wording and styling --- .../mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb index 7152aeff..2be45008 100644 --- a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb +++ b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb @@ -47,7 +47,6 @@
  • Build logs
  • Customized images
    • -

    Data older than <%= @retention[:months] %> months associated with your account has been deleted in accordance with our retention policy.

    No further action is required on your part.
    From c406877570ad87db0110137bd1aab3325048c6c0 Mon Sep 17 00:00:00 2001 From: tonoyansergey-devt Date: Mon, 13 Oct 2025 11:13:16 +0400 Subject: [PATCH 10/12] TBT-428 Correct email signature --- .../views/gdpr_mailer/data_retention_notice.html.erb | 9 ++++++--- .../gdpr_mailer/upcoming_data_deletion_notice.html.erb | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_retention_notice.html.erb b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_retention_notice.html.erb index d98d4505..210d3992 100644 --- a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_retention_notice.html.erb +++ b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_retention_notice.html.erb @@ -60,9 +60,12 @@ - -

    Thank you for your attention,

    -

    Travis CI Support Team

    + +

    + Thank you for your attention, +
    + Travis CI Support Team +

    diff --git a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/upcoming_data_deletion_notice.html.erb b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/upcoming_data_deletion_notice.html.erb index 652e5c92..dd1871e5 100644 --- a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/upcoming_data_deletion_notice.html.erb +++ b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/upcoming_data_deletion_notice.html.erb @@ -61,9 +61,12 @@ - -

    Thank you for helping us maintain a clean and efficient storage environment,

    -

    Travis CI Support Team

    + +

    + Thank you for helping us maintain a clean and efficient storage environment, +
    + Travis CI Support Team +

    From b3a5f7edbf0b1eb2c32c57ebf97515b76987439d Mon Sep 17 00:00:00 2001 From: tonoyansergey-devt Date: Mon, 13 Oct 2025 11:17:44 +0400 Subject: [PATCH 11/12] TBT-428 Update doucmentation links --- .../views/gdpr_mailer/data_deletion_confirmation.html.erb | 2 +- .../mailer/views/gdpr_mailer/data_retention_notice.html.erb | 4 ++-- .../views/gdpr_mailer/upcoming_data_deletion_notice.html.erb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb index 2be45008..e75ee999 100644 --- a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb +++ b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb @@ -51,7 +51,7 @@ No further action is required on your part.
    If you have questions about this removal or our retention policy, please refer to our - documentation or contact our support team. + documentation or contact our support team.

    diff --git a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_retention_notice.html.erb b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_retention_notice.html.erb index 210d3992..3fc171af 100644 --- a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_retention_notice.html.erb +++ b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_retention_notice.html.erb @@ -54,8 +54,8 @@

    Please review and, if necessary, back up or remove this data to ensure continued compliance with storage policies and to free up space for future.

    If no action is taken, older data may be subject to automatic removal in accordance with our retention policy (within next <%= @retention[:days_until_deletion] %> days).

    -

    For details on managing stored data, please refer to our documentation: - Documentation +

    + For details on managing stored data, please refer to our documentation.

    diff --git a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/upcoming_data_deletion_notice.html.erb b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/upcoming_data_deletion_notice.html.erb index dd1871e5..73548d7f 100644 --- a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/upcoming_data_deletion_notice.html.erb +++ b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/upcoming_data_deletion_notice.html.erb @@ -55,8 +55,8 @@
  • Customized images

    • If you wish to retain this data, please back it up or update it before the scheduled removal date.

    -

    For guidance on managing stored data, please see our documentation: - Documentation +

    + For guidance on managing stored data, please see our documentation.

    From 6d3af40b39f301b1fc2c32adf0c41bacdcb951a9 Mon Sep 17 00:00:00 2001 From: tonoyansergey-devt Date: Thu, 16 Oct 2025 10:54:37 +0400 Subject: [PATCH 12/12] TBT-428 Recover confirmation email header --- lib/travis/addons/gdpr/mailer/gdpr_mailer.rb | 2 +- .../views/gdpr_mailer/data_deletion_confirmation.html.erb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb b/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb index 71969875..263c3c2d 100644 --- a/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb +++ b/lib/travis/addons/gdpr/mailer/gdpr_mailer.rb @@ -55,7 +55,7 @@ def data_deletion_confirmation(receivers, owner, retention) # Comes from travis- mail( from: travis_email, to: receivers, - subject: "Confirmation: Data Older Than #{retention[:months]} Has Been Removed", + subject: "Confirmation: Data Older Than #{retention[:months]} Months Has Been Removed", template_path: 'gdpr_mailer' ) end diff --git a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb index e75ee999..000de682 100644 --- a/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb +++ b/lib/travis/addons/gdpr/mailer/views/gdpr_mailer/data_deletion_confirmation.html.erb @@ -37,6 +37,11 @@ Travis CI Logo + + +

    Confirmation: Data Older Than <%= @retention[:months] %> Months Has Been Removed

    + +

    Hello <%= @owner[:name] %>,