diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 12:08:38 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 12:08:38 +0000 |
| commit | 5ad0cf26551baff8f08af8562a8d45e6ec14d71a (patch) | |
| tree | 57f1a6bad31bcd11efacd3fdfb9cc92f88fb6a86 /app/views/notify | |
| parent | f47c768fad17d4c876e96524f83f8306f071db66 (diff) | |
| download | gitlab-ce-5ad0cf26551baff8f08af8562a8d45e6ec14d71a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/note_project_snippet_email.html.haml | 1 | ||||
| -rw-r--r-- | app/views/notify/note_project_snippet_email.text.erb | 1 | ||||
| -rw-r--r-- | app/views/notify/note_snippet_email.html.haml (renamed from app/views/notify/note_personal_snippet_email.html.haml) | 0 | ||||
| -rw-r--r-- | app/views/notify/note_snippet_email.text.erb (renamed from app/views/notify/note_personal_snippet_email.text.erb) | 0 |
4 files changed, 0 insertions, 2 deletions
diff --git a/app/views/notify/note_project_snippet_email.html.haml b/app/views/notify/note_project_snippet_email.html.haml deleted file mode 100644 index 5e69f01a486..00000000000 --- a/app/views/notify/note_project_snippet_email.html.haml +++ /dev/null @@ -1 +0,0 @@ -= render 'note_email' diff --git a/app/views/notify/note_project_snippet_email.text.erb b/app/views/notify/note_project_snippet_email.text.erb deleted file mode 100644 index 413d9e6e9ac..00000000000 --- a/app/views/notify/note_project_snippet_email.text.erb +++ /dev/null @@ -1 +0,0 @@ -<%= render 'note_email' %> diff --git a/app/views/notify/note_personal_snippet_email.html.haml b/app/views/notify/note_snippet_email.html.haml index 5e69f01a486..5e69f01a486 100644 --- a/app/views/notify/note_personal_snippet_email.html.haml +++ b/app/views/notify/note_snippet_email.html.haml diff --git a/app/views/notify/note_personal_snippet_email.text.erb b/app/views/notify/note_snippet_email.text.erb index 413d9e6e9ac..413d9e6e9ac 100644 --- a/app/views/notify/note_personal_snippet_email.text.erb +++ b/app/views/notify/note_snippet_email.text.erb |