VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-07-25 16:03:48 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add latest changes from gitlab-org/gitlab@master

Browse Source
This commit is contained in:
GitLab Bot
2020-07-14 15:09:05 +00:00
parent 49089d4fb1
commit 66bd1f0fdc
83 changed files with 2412 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/event_filter.rb
View File

@ -52,15 +52,12 @@ class EventFilter
private
def apply_feature_flags(events)
events = events.not_wiki_page unless Feature.enabled?(:wiki_events)
events = events.not_design unless can_view_design_activity?
events
end
def wiki_events(events)
return events unless Feature.enabled?(:wiki_events)
events.for_wiki_page
end