diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 12:08:19 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 12:08:19 +0000 |
| commit | e6baeabaa9651d90b03bb64ffce75a2c3cb89aab (patch) | |
| tree | 85f3cbd6e437b17be59505cf3ac4794c1838609e /app/views/shared | |
| parent | 5064bf8c5647d4c4430cbb4d097cf1592416de29 (diff) | |
| download | gitlab-ce-e6baeabaa9651d90b03bb64ffce75a2c3cb89aab.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/_event_filter.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/shared/_event_filter.html.haml b/app/views/shared/_event_filter.html.haml index ad9eb325ff0..1b2e8d3799d 100644 --- a/app/views/shared/_event_filter.html.haml +++ b/app/views/shared/_event_filter.html.haml @@ -15,4 +15,6 @@ = render_if_exists 'events/epics_filter' - if comments_visible? = event_filter_link EventFilter::COMMENTS, _('Comments'), s_('EventFilterBy|Filter by comments') + - if Feature.enabled?(:wiki_events) && (@project.nil? || @project.has_wiki?) + = event_filter_link EventFilter::WIKI, _('Wiki'), s_('EventFilterBy|Filter by wiki') = event_filter_link EventFilter::TEAM, _('Team'), s_('EventFilterBy|Filter by team') |