Add latest changes from gitlab-org/gitlab@master

4 files changed, 24 insertions, 0 deletions

diff --git a/app/views/notify/application_authorized_email.html.haml b/app/views/notify/application_authorized_email.html.haml
new file mode 100644
index 00000000000..0e4635422cc
--- /dev/null
+++ b/app/views/notify/application_authorized_email.html.haml
@@ -0,0 +1,5 @@
+%p
+  = _('Hi %{username}!') % { username: sanitize_name(@user.name) }
+%p
+  - docs_link = link_to _("documentation"), help_page_url('integration/oauth_provider', anchor: 'view-all-authorized-applications'), target: '_blank', rel: 'noopener noreferrer'
+  = s_('Notify|A new OAuth 2 application has been authorized. If you did not expect this, check the authorized OAuth 2 applications %{docs_link}.').html_safe % { docs_link: docs_link }
diff --git a/app/views/notify/application_authorized_email.text.erb b/app/views/notify/application_authorized_email.text.erb
new file mode 100644
index 00000000000..7bc550e0854
--- /dev/null
+++ b/app/views/notify/application_authorized_email.text.erb
@@ -0,0 +1,7 @@
+<p>
+  <%= _('Hi %{username}!') % { username: sanitize_name(@user.name) } %>
+</p>
+<p>
+  <% docs_link = link_to _("documentation"), help_page_url('integration/oauth_provider', anchor: 'view-all-authorized-applications'), target: '_blank', rel: 'noopener noreferrer' %>
+  <%= s_('Notify|A new OAuth 2 application has been authorized. If you did not expect this, check the authorized OAuth 2 applications %{docs_link}.').html_safe % { docs_link: docs_link } %>
+</p>
\ No newline at end of file
diff --git a/app/views/notify/application_created_email.html.haml b/app/views/notify/application_created_email.html.haml
new file mode 100644
index 00000000000..1113cc13d0b
--- /dev/null
+++ b/app/views/notify/application_created_email.html.haml
@@ -0,0 +1,5 @@
+%p
+  = _('Hi %{username}!') % { username: sanitize_name(@user.name) }
+%p
+  - docs_link = link_to _("documentation"), help_page_url('integration/oauth_provider'), target: '_blank', rel: 'noopener noreferrer'
+  = s_('Notify|A new OAuth 2 application has been created. If you did not create this application, check the OAuth 2 applications %{docs_link}.').html_safe % { docs_link: docs_link }
diff --git a/app/views/notify/application_created_email.text.erb b/app/views/notify/application_created_email.text.erb
new file mode 100644
index 00000000000..8164f342f9a
--- /dev/null
+++ b/app/views/notify/application_created_email.text.erb
@@ -0,0 +1,7 @@
+<p>
+  <%= _('Hi %{username}!') % { username: sanitize_name(@user.name) } %>
+</p>
+<p>
+  <% docs_link = link_to _("documentation"), help_page_url('integration/oauth_provider'), target: '_blank', rel: 'noopener noreferrer' %>
+  <%= s_('Notify|A new OAuth 2 application has been created. If you did not create this application, check the OAuth 2 applications %{docs_link}.').html_safe % { docs_link: docs_link } %>
+</p>
\ No newline at end of file