Resolving CE->EE conflict

56d684b1 · Valery Sizov · dcd092d5 · 56d684b1
Commit 56d684b1 authored Jan 05, 2017 by Valery Sizov
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/services/issuable_base_service.rb app/services/issuable_base_service.rb +0 -4

No files found.
--- a/app/services/issuable_base_service.rb
+++ b/app/services/issuable_base_service.rb
@@ -44,10 +44,6 @@ class IssuableBaseService < BaseService
    SystemNoteService.change_time_spent(issuable, issuable.project, current_user)
  end
-  def filter_params(issuable)
-    ability_name = :"admin_#{issuable.to_ability_name}"
-  end
  def filter_params(issuable)
    ability_name = :"admin_#{issuable.to_ability_name}"