Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 2 deletions

diff --git a/app/services/namespaces/in_product_marketing_emails_service.rb b/app/services/namespaces/in_product_marketing_emails_service.rb
index 04fca075007..b29e07625d0 100644
--- a/app/services/namespaces/in_product_marketing_emails_service.rb
+++ b/app/services/namespaces/in_product_marketing_emails_service.rb
@@ -13,8 +13,13 @@ module Namespaces
         completed_actions: [:git_write],
         incomplete_actions: [:user_added]
       },
+      trial_short: {
+        interval_days: [2],
+        completed_actions: [:git_write],
+        incomplete_actions: [:trial_started]
+      },
       verify: {
-        interval_days: [2, 6, 11],
+        interval_days: [3, 7, 12],
         completed_actions: [:git_write],
         incomplete_actions: [:pipeline_created]
       },
@@ -105,7 +110,7 @@ module Namespaces
       case track
       when :create, :verify
         user.can?(:create_projects, group)
-      when :trial
+      when :trial, :trial_short
         user.can?(:start_trial, group)
       when :team, :team_short
         user.can?(:admin_group_member, group)