diff options
| author | Cindy Pallares <cindy@gitlab.com> | 2018-11-28 22:04:15 +0300 |
|---|---|---|
| committer | Cindy Pallares <cindy@gitlab.com> | 2018-11-29 03:11:56 +0300 |
| commit | e122e14ac6a25c7813ca888a97bd4a3298e78d9d (patch) | |
| tree | bd3774fae0517a63dd1e30b3fc95c00c54878357 /app/views/notify | |
| parent | ffd1c4cd453043448198d4a1c9582f5c54f5c377 (diff) | |
Merge branch 'security-guest-comments' into 'master'
[master]Fixed ability to comment on and edit/delete comments on locked or confidential issues
See merge request gitlab/gitlabhq!2612
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/note_project_snippet_email.html.haml (renamed from app/views/notify/note_snippet_email.html.haml) | 0 | ||||
| -rw-r--r-- | app/views/notify/note_project_snippet_email.text.erb (renamed from app/views/notify/note_snippet_email.text.erb) | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/app/views/notify/note_snippet_email.html.haml b/app/views/notify/note_project_snippet_email.html.haml index 5e69f01a486..5e69f01a486 100644 --- a/app/views/notify/note_snippet_email.html.haml +++ b/app/views/notify/note_project_snippet_email.html.haml diff --git a/app/views/notify/note_snippet_email.text.erb b/app/views/notify/note_project_snippet_email.text.erb index 413d9e6e9ac..413d9e6e9ac 100644 --- a/app/views/notify/note_snippet_email.text.erb +++ b/app/views/notify/note_project_snippet_email.text.erb |