summaryrefslogtreecommitdiff
path: root/app/views/notify
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-12 00:10:11 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-12 00:10:11 +0000
commitc6f0b221b71133792f2c9e5a026f3744c16d5ef5 (patch)
tree864e5737806d454fbf23c681d5bced9b3e4a7d77 /app/views/notify
parent3f45eb27e9586ad87682c2d125770e119a7e9fe0 (diff)
downloadgitlab-ce-c6f0b221b71133792f2c9e5a026f3744c16d5ef5.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/notify')
-rw-r--r--app/views/notify/note_design_email.html.haml1
-rw-r--r--app/views/notify/note_design_email.text.erb1
2 files changed, 2 insertions, 0 deletions
diff --git a/app/views/notify/note_design_email.html.haml b/app/views/notify/note_design_email.html.haml
new file mode 100644
index 00000000000..5e69f01a486
--- /dev/null
+++ b/app/views/notify/note_design_email.html.haml
@@ -0,0 +1 @@
+= render 'note_email'
diff --git a/app/views/notify/note_design_email.text.erb b/app/views/notify/note_design_email.text.erb
new file mode 100644
index 00000000000..413d9e6e9ac
--- /dev/null
+++ b/app/views/notify/note_design_email.text.erb
@@ -0,0 +1 @@
+<%= render 'note_email' %>