diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-09-11 21:15:06 +0300 |
|---|---|---|
| committer | Thiago Presa <tpresa@gitlab.com> | 2018-09-11 21:31:48 +0300 |
| commit | 54701ab047cf4e8c6d1a71c9097a47b069724872 (patch) | |
| tree | 65b8114c32b99a5a8f304713785244923b96f3df /app | |
| parent | 24881c51369f32714f53bf8c3245d5b46895839d (diff) | |
Merge branch '51375-fix-activity-pages' into 'master'
Fix the group and project activity pages
Closes #51375
See merge request gitlab-org/gitlab-ce!21674
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/events/_event.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml index 5623f0f590a..78a1d1a0553 100644 --- a/app/views/events/_event.html.haml +++ b/app/views/events/_event.html.haml @@ -11,5 +11,5 @@ = render "events/event/note", event: event - else = render "events/event/common", event: event -- elsif @user.include_private_contributions? +- elsif @user&.include_private_contributions? = render "events/event/private", event: event |