Add latest changes from gitlab-org/gitlab@13-4-stable-ee

9 files changed, 35 insertions, 16 deletions

diff --git a/app/views/notify/_failed_builds.html.haml b/app/views/notify/_failed_builds.html.haml
index 1711c34a842..cde0ac21d6d 100644
--- a/app/views/notify/_failed_builds.html.haml
+++ b/app/views/notify/_failed_builds.html.haml
@@ -23,10 +23,3 @@
                       = build.stage
             %td{ align: "right", style: "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; padding: 16px 0; color: #8c8c8c; font-weight: 500; font-size: 14px;" }
               = render "notify/links/#{build.to_partial_path}", pipeline: pipeline, build: build
-          %tr.build-log
-            - if build.has_trace?
-              %td{ colspan: "2", style: "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; padding: 0 0 16px;" }
-                %pre{ style: "font-family: Monaco,'Lucida Console','Courier New',Courier,monospace; background-color: #fafafa; border-radius: 4px; overflow: hidden; white-space: pre-wrap; word-break: break-all; font-size:13px; line-height: 1.4; padding: 16px 8px; color: #333333; margin: 0;" }
-                  = build.trace.html(last_lines: 30).html_safe
-            - else
-              %td{ colspan: "2" }
diff --git a/app/views/notify/autodevops_disabled_email.text.erb b/app/views/notify/autodevops_disabled_email.text.erb
index 91092060e74..f849c017265 100644
--- a/app/views/notify/autodevops_disabled_email.text.erb
+++ b/app/views/notify/autodevops_disabled_email.text.erb
@@ -14,7 +14,4 @@ had <%= failed.size %> failed <%= 'build'.pluralize(failed.size) %>.
   <%= render "notify/links/#{build.to_partial_path}", pipeline: @pipeline, build: build %>
   Stage: <%= build.stage %>
   Name: <%= build.name %>
-  <% if build.has_trace? -%>
-    Trace: <%= build.trace.raw(last_lines: 30) %>
-  <% end -%>
 <% end -%>
diff --git a/app/views/notify/disabled_two_factor_email.html.haml b/app/views/notify/disabled_two_factor_email.html.haml
new file mode 100644
index 00000000000..8c64a43fc07
--- /dev/null
+++ b/app/views/notify/disabled_two_factor_email.html.haml
@@ -0,0 +1,6 @@
+%p
+  = say_hi(@user)
+%p
+  = two_factor_authentication_disabled_text
+%p
+  = re_enable_two_factor_authentication_text(format: :html)
diff --git a/app/views/notify/disabled_two_factor_email.text.erb b/app/views/notify/disabled_two_factor_email.text.erb
new file mode 100644
index 00000000000..46eeab4414f
--- /dev/null
+++ b/app/views/notify/disabled_two_factor_email.text.erb
@@ -0,0 +1,5 @@
+<%= say_hi(@user) %>
+
+<%= two_factor_authentication_disabled_text %>
+
+<%= re_enable_two_factor_authentication_text %>
diff --git a/app/views/notify/member_invited_email.html.haml b/app/views/notify/member_invited_email.html.haml
index ae3fecf404a..4fcd2936d25 100644
--- a/app/views/notify/member_invited_email.html.haml
+++ b/app/views/notify/member_invited_email.html.haml
@@ -10,7 +10,7 @@
       #{member_source.model_name.singular} as #{content_tag :span, member.human_access, class: :highlight}.
 
     %p
-      = link_to 'Accept invitation', invite_url(@token)
+      = link_to 'Accept invitation', invite_url(@token, @invite_url_params)
       or
       = link_to 'decline', decline_invite_url(@token)
 
diff --git a/app/views/notify/member_invited_email.text.erb b/app/views/notify/member_invited_email.text.erb
index d944c3b4a50..e6e6a685f92 100644
--- a/app/views/notify/member_invited_email.text.erb
+++ b/app/views/notify/member_invited_email.text.erb
@@ -1,4 +1,4 @@
 You have been invited <%= "by #{sanitize_name(member.created_by.name)} " if member.created_by %>to join the <%= member_source.human_name %> <%= member_source.model_name.singular %> as <%= member.human_access %>.
 
-Accept invitation: <%= invite_url(@token) %>
+Accept invitation: <%= invite_url(@token, @invite_url_params) %>
 Decline invitation: <%= decline_invite_url(@token) %>
diff --git a/app/views/notify/member_invited_email_experiment.html.haml b/app/views/notify/member_invited_email_experiment.html.haml
new file mode 100644
index 00000000000..5cfb6acee05
--- /dev/null
+++ b/app/views/notify/member_invited_email_experiment.html.haml
@@ -0,0 +1,12 @@
+%tr
+  %td.text-content
+    %h2.invite-header
+      = s_('InviteEmail|You are invited!')
+    %p
+      - if member.created_by
+        = html_escape(s_("InviteEmail|%{inviter} invited you")) % { inviter: (link_to member.created_by.name, user_url(member.created_by)).html_safe }
+      = html_escape(s_("InviteEmail|to join the %{strong_start}%{project_or_group_name}%{strong_end}")) % { strong_start: '<strong>'.html_safe, strong_end: '</strong>'.html_safe, project_or_group_name: member_source.human_name }
+      %br
+      = s_("InviteEmail|%{project_or_group} as a %{role}") % { project_or_group: member_source.model_name.singular, role: member.human_access.downcase }
+    %p.invite-actions
+      = link_to s_('InviteEmail|Join now'), invite_url(@token, @invite_url_params), class: 'invite-btn-join'
diff --git a/app/views/notify/member_invited_email_experiment.text.erb b/app/views/notify/member_invited_email_experiment.text.erb
new file mode 100644
index 00000000000..6843cea4df7
--- /dev/null
+++ b/app/views/notify/member_invited_email_experiment.text.erb
@@ -0,0 +1,10 @@
+<% project_and_role = s_('InviteEmail|to join the %{project_or_group_name} %{project_or_group} as a %{role}') \
+  % { project_or_group_name: member_source.human_name, project_or_group: member_source.model_name.singular, role: member.human_access.downcase } %>
+
+<% if member.created_by %>
+<%= s_('InviteEmail|%{inviter} invited you') % { inviter: sanitize_name(member.created_by.name) } %> <%= project_and_role %>
+<% else %>
+<%= s_('InviteEmail|You have been invited') %> <%= project_and_role %>
+<% end %>
+
+Join now: <%= invite_url(@token, @invite_url_params) %>
diff --git a/app/views/notify/pipeline_failed_email.text.erb b/app/views/notify/pipeline_failed_email.text.erb
index 41b26842dbc..b388aad7048 100644
--- a/app/views/notify/pipeline_failed_email.text.erb
+++ b/app/views/notify/pipeline_failed_email.text.erb
@@ -34,8 +34,4 @@ had <%= failed.size %> failed <%= 'build'.pluralize(failed.size) %>.
 <%= render "notify/links/#{build.to_partial_path}", pipeline: @pipeline, build: build %>
 Stage: <%= build.stage %>
 Name: <%= build.name %>
-<% if build.has_trace? -%>
-Trace: <%= build.trace.raw(last_lines: 30) %>
-<% end -%>
-
 <% end -%>