summaryrefslogtreecommitdiff
path: root/app/views/groups
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-11 06:06:27 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-11 06:06:27 +0000
commitb4e072cbaf808793bafff148b0ec9d47819f479e (patch)
treec690c706803cf43b3358785681e693ea0e1f9f94 /app/views/groups
parent8c0166b9816477521bf34feb15575bbeb1a3c644 (diff)
downloadgitlab-ce-b4e072cbaf808793bafff148b0ec9d47819f479e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/groups')
-rw-r--r--app/views/groups/_activities.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/groups/_activities.html.haml b/app/views/groups/_activities.html.haml
index 13df1e57125..44554cab1e9 100644
--- a/app/views/groups/_activities.html.haml
+++ b/app/views/groups/_activities.html.haml
@@ -1,5 +1,5 @@
.nav-block.activities
- = render 'shared/event_filter'
+ = render 'shared/event_filter', show_group_events: @group.supports_events?
.controls
= link_to group_path(@group, rss_url_options), class: 'btn d-none d-sm-inline-block has-tooltip' , title: 'Subscribe' do
%i.fa.fa-rss