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:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-09-27 00:10:08 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-09-27 00:10:08 +0300
commit13272cad0b5e74d26722a227b4965944d65b0e79 (patch)
treed5d4b05fab2b6149e482e7c60c21ba9bd427ce01 /app/views/notify
parent332df93cf612d3ad71e35f6dc214f9b984d45287 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/notify')
-rw-r--r--app/views/notify/application_authorized_email.html.haml5
-rw-r--r--app/views/notify/application_authorized_email.text.erb7
-rw-r--r--app/views/notify/application_created_email.html.haml5
-rw-r--r--app/views/notify/application_created_email.text.erb7
4 files changed, 0 insertions, 24 deletions
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