From 13272cad0b5e74d26722a227b4965944d65b0e79 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 26 Sep 2023 21:10:08 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/views/notify/application_authorized_email.html.haml | 5 -----
 app/views/notify/application_authorized_email.text.erb  | 7 -------
 app/views/notify/application_created_email.html.haml    | 5 -----
 app/views/notify/application_created_email.text.erb     | 7 -------
 4 files changed, 24 deletions(-)
 delete mode 100644 app/views/notify/application_authorized_email.html.haml
 delete mode 100644 app/views/notify/application_authorized_email.text.erb
 delete mode 100644 app/views/notify/application_created_email.html.haml
 delete mode 100644 app/views/notify/application_created_email.text.erb

(limited to 'app/views/notify')

diff --git a/app/views/notify/application_authorized_email.html.haml b/app/views/notify/application_authorized_email.html.haml
deleted file mode 100644
index 0e4635422cc..00000000000
--- a/app/views/notify/application_authorized_email.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-%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
deleted file mode 100644
index 7bc550e0854..00000000000
--- a/app/views/notify/application_authorized_email.text.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<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
deleted file mode 100644
index 1113cc13d0b..00000000000
--- a/app/views/notify/application_created_email.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-%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
deleted file mode 100644
index 8164f342f9a..00000000000
--- a/app/views/notify/application_created_email.text.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<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
-- 
cgit v1.2.3