Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/email/message')
-rw-r--r--lib/gitlab/email/message/in_product_marketing/admin_verify.rb43
-rw-r--r--lib/gitlab/email/message/in_product_marketing/base.rb8
-rw-r--r--lib/gitlab/email/message/in_product_marketing/create.rb2
-rw-r--r--lib/gitlab/email/message/in_product_marketing/team.rb4
-rw-r--r--lib/gitlab/email/message/in_product_marketing/team_short.rb47
-rw-r--r--lib/gitlab/email/message/in_product_marketing/trial.rb4
-rw-r--r--lib/gitlab/email/message/in_product_marketing/trial_short.rb47
-rw-r--r--lib/gitlab/email/message/in_product_marketing/verify.rb2
8 files changed, 151 insertions, 6 deletions
diff --git a/lib/gitlab/email/message/in_product_marketing/admin_verify.rb b/lib/gitlab/email/message/in_product_marketing/admin_verify.rb
new file mode 100644
index 00000000000..234b93594b5
--- /dev/null
+++ b/lib/gitlab/email/message/in_product_marketing/admin_verify.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Gitlab
+ module Email
+ module Message
+ module InProductMarketing
+ class AdminVerify < Base
+ def subject_line
+ s_('InProductMarketing|Create a custom CI runner with just a few clicks')
+ end
+
+ def tagline
+ nil
+ end
+
+ def title
+ s_('InProductMarketing|Spin up an autoscaling runner in GitLab')
+ end
+
+ def subtitle
+ s_('InProductMarketing|Use our AWS cloudformation template to spin up your runners in just a few clicks!')
+ end
+
+ def body_line1
+ ''
+ end
+
+ def body_line2
+ ''
+ end
+
+ def cta_text
+ s_('InProductMarketing|Create a custom runner')
+ end
+
+ def progress
+ super(track_name: 'Admin')
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/lib/gitlab/email/message/in_product_marketing/base.rb b/lib/gitlab/email/message/in_product_marketing/base.rb
index 89acc058a46..96551c89837 100644
--- a/lib/gitlab/email/message/in_product_marketing/base.rb
+++ b/lib/gitlab/email/message/in_product_marketing/base.rb
@@ -67,11 +67,11 @@ module Gitlab
end
end
- def progress
+ def progress(current: series + 1, total: total_series, track_name: track.to_s.humanize)
if Gitlab.com?
- s_('InProductMarketing|This is email %{current_series} of %{total_series} in the %{track} series.') % { current_series: series + 1, total_series: total_series, track: track.to_s.humanize }
+ s_('InProductMarketing|This is email %{current_series} of %{total_series} in the %{track} series.') % { current_series: current, total_series: total, track: track_name }
else
- s_('InProductMarketing|This is email %{current_series} of %{total_series} in the %{track} series. To disable notification emails sent by your local GitLab instance, either contact your administrator or %{unsubscribe_link}.') % { current_series: series + 1, total_series: total_series, track: track.to_s.humanize, unsubscribe_link: unsubscribe_link }
+ s_('InProductMarketing|This is email %{current_series} of %{total_series} in the %{track} series. To disable notification emails sent by your local GitLab instance, either contact your administrator or %{unsubscribe_link}.') % { current_series: current, total_series: total, track: track_name, unsubscribe_link: unsubscribe_link }
end
end
@@ -109,7 +109,7 @@ module Gitlab
private
def track
- self.class.name.demodulize.downcase.to_sym
+ self.class.name.demodulize.underscore.to_sym
end
def total_series
diff --git a/lib/gitlab/email/message/in_product_marketing/create.rb b/lib/gitlab/email/message/in_product_marketing/create.rb
index 5d3cac0a121..4b0c4af4911 100644
--- a/lib/gitlab/email/message/in_product_marketing/create.rb
+++ b/lib/gitlab/email/message/in_product_marketing/create.rb
@@ -84,7 +84,7 @@ module Gitlab
end
def basics_link
- link(s_('InProductMarketing|Git basics'), help_page_url('gitlab-basics/README'))
+ link(s_('InProductMarketing|Git basics'), help_page_url('gitlab-basics/index'))
end
def import_link
diff --git a/lib/gitlab/email/message/in_product_marketing/team.rb b/lib/gitlab/email/message/in_product_marketing/team.rb
index 46c2797e534..cf723ad5efd 100644
--- a/lib/gitlab/email/message/in_product_marketing/team.rb
+++ b/lib/gitlab/email/message/in_product_marketing/team.rb
@@ -73,6 +73,10 @@ module Gitlab
s_('InProductMarketing|Invite your team now')
][series]
end
+
+ def progress
+ super(current: series + 2, total: 4)
+ end
end
end
end
diff --git a/lib/gitlab/email/message/in_product_marketing/team_short.rb b/lib/gitlab/email/message/in_product_marketing/team_short.rb
new file mode 100644
index 00000000000..1d60a5fe4e5
--- /dev/null
+++ b/lib/gitlab/email/message/in_product_marketing/team_short.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Gitlab
+ module Email
+ module Message
+ module InProductMarketing
+ class TeamShort < Base
+ def subject_line
+ s_('InProductMarketing|Team up in GitLab for greater efficiency')
+ end
+
+ def tagline
+ nil
+ end
+
+ def title
+ s_('InProductMarketing|Turn coworkers into collaborators')
+ end
+
+ def subtitle
+ s_('InProductMarketing|Invite your team today to build better code (and processes) together')
+ end
+
+ def body_line1
+ ''
+ end
+
+ def body_line2
+ ''
+ end
+
+ def cta_text
+ s_('InProductMarketing|Invite your colleagues today')
+ end
+
+ def progress
+ super(total: 4, track_name: 'Team')
+ end
+
+ def logo_path
+ 'mailers/in_product_marketing/team-0.png'
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/lib/gitlab/email/message/in_product_marketing/trial.rb b/lib/gitlab/email/message/in_product_marketing/trial.rb
index d87dc5c1b81..222046a3966 100644
--- a/lib/gitlab/email/message/in_product_marketing/trial.rb
+++ b/lib/gitlab/email/message/in_product_marketing/trial.rb
@@ -68,6 +68,10 @@ module Gitlab
s_('InProductMarketing|Start your trial now!')
][series]
end
+
+ def progress
+ super(current: series + 2, total: 4)
+ end
end
end
end
diff --git a/lib/gitlab/email/message/in_product_marketing/trial_short.rb b/lib/gitlab/email/message/in_product_marketing/trial_short.rb
new file mode 100644
index 00000000000..0fcd3fde4a6
--- /dev/null
+++ b/lib/gitlab/email/message/in_product_marketing/trial_short.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Gitlab
+ module Email
+ module Message
+ module InProductMarketing
+ class TrialShort < Base
+ def subject_line
+ s_('InProductMarketing|Be a DevOps hero')
+ end
+
+ def tagline
+ nil
+ end
+
+ def title
+ s_('InProductMarketing|Expand your DevOps journey with a free GitLab trial')
+ end
+
+ def subtitle
+ s_('InProductMarketing|Start your trial today to experience single application success and discover all the features of GitLab Ultimate for free!')
+ end
+
+ def body_line1
+ ''
+ end
+
+ def body_line2
+ ''
+ end
+
+ def cta_text
+ s_('InProductMarketing|Start a trial')
+ end
+
+ def progress
+ super(total: 4, track_name: 'Trial')
+ end
+
+ def logo_path
+ 'mailers/in_product_marketing/trial-0.png'
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/lib/gitlab/email/message/in_product_marketing/verify.rb b/lib/gitlab/email/message/in_product_marketing/verify.rb
index 88140c67804..e731c65121e 100644
--- a/lib/gitlab/email/message/in_product_marketing/verify.rb
+++ b/lib/gitlab/email/message/in_product_marketing/verify.rb
@@ -72,7 +72,7 @@ module Gitlab
end
def quick_start_link
- link(s_('InProductMarketing|quick start guide'), help_page_url('ci/quick_start/README'))
+ link(s_('InProductMarketing|quick start guide'), help_page_url('ci/quick_start/index'))
end
def performance_link