Correctly passes feature key into feature_available methodproject-activity-tabs-hide

2 files changed, 3 insertions, 36 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccaf913763d..319c726e3a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 - Fix HipChat notifications rendering (airatshigapov, eisnerd)
 - Refactor Jira service to use jira-ruby gem
 - Add hover to trash icon in notes !7008 (blackst0ne)
+- Hides project activity tabs when features are disabled
 - Only show one error message for an invalid email !5905 (lycoperdon)
 - Fix sidekiq stats in admin area (blackst0ne)
 - Created cycle analytics bundle JavaScript file
@@ -57,40 +58,6 @@ Please view this file on the master branch, on stable branches it's out of date.
 - Fix and improve `Sortable.highest_label_priority`. !7165
 - Fixed sticky merge request tabs when sidebar is pinned. !7167
 - Only remove right connector of first build of last stage. !7179
-  - Backups do not fail anymore when using tar on annex and custom_hooks only. !5814
-  - Adds user project membership expired event to clarify why user was removed (Callum Dryden)
-  - Hides project activity tabs when features are disabled
-  - Trim leading and trailing whitespace on project_path (Linus Thiel)
-  - Prevent award emoji via notes for issues/MRs authored by user (barthc)
-  - Adds an optional path parameter to the Commits API to filter commits by path (Luis HGO)
-  - Fix extra space on Build sidebar on Firefox !7060
-  - Fix mobile layout issues in admin user overview page !7087
-  - Fix HipChat notifications rendering (airatshigapov, eisnerd)
-  - Add hover to trash icon in notes !7008 (blackst0ne)
-  - Fix sidekiq stats in admin area (blackst0ne)
-  - Removed delete branch tooltip !6954
-  - Escape ref and path for relative links !6050 (winniehell)
-  - Fixed link typo on /help/ui to Alerts section. !6915 (Sam Rose)
-  - Fix filtering of milestones with quotes in title (airatshigapov)
-  - Refactor less readable existance checking code from CoffeeScript !6289 (jlogandavison)
-  - Update mail_room and enable sentinel support to Reply By Email (!7101)
-  - Simpler arguments passed to named_route on toggle_award_url helper method
-  - Fix typo in framework css class. !7086 (Daniel Voogsgerd)
-  - New issue board list dropdown stays open after adding a new list
-  - Fix: Backup restore doesn't clear cache
-  - API: Fix project deploy keys 400 and 500 errors when adding an existing key. !6784 (Joshua Welsh)
-  - Replace jquery.cookie plugin with js.cookie !7085
-  - Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests method
-  - Fix Sign in page 'Forgot your password?' link overlaps on medium-large screens
-  - Show full status link on MR & commit pipelines
-  - Fix documents and comments on Build API `scope`
-  - Fix applying labels for GitHub-imported MRs
-  - Fix importing MR comments from GitHub
-  - Refactor email, use setter method instead AR callbacks for email attribute (Semyon Pupkov)
-  - Shortened merge request modal to let clipboard button not overlap
-
-## 8.13.2
-  - Fix builds dropdown overlapping bug !7124
 
 ## 8.13.1 (2016-10-25)
 
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 0fc50f40a6e..00e64076408 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -39,10 +39,10 @@ module EventsHelper
     end
   end
 
-  def event_filter_visible(key)
+  def event_filter_visible(feature_key)
     return true unless @project
 
-    @project.feature_available?(:repository, current_user)
+    @project.feature_available?(feature_key, current_user)
   end
 
   def event_preposition(event)