diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-02-20 14:05:44 +0100 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-02-20 14:05:44 +0100 |
| commit | 2b0e8b86d8aa35ac094d18bfefaa81af916347fa (patch) | |
| tree | a0469ccf9e179832b2231c7f2abfa23956a4048f /app/services/base_service.rb | |
| parent | 444d71e043eb19979ec1b08504b2760910cb2a47 (diff) | |
| parent | c89449e6110c2bdf6e1410bae3e7b7d807c5e305 (diff) | |
| download | gitlab-ce-2b0e8b86d8aa35ac094d18bfefaa81af916347fa.tar.gz | |
Merge branch 'master' into zj-create-mattermost-team
Diffstat (limited to 'app/services/base_service.rb')
| -rw-r--r-- | app/services/base_service.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/services/base_service.rb b/app/services/base_service.rb index 1a2bad77a02..fa45506317e 100644 --- a/app/services/base_service.rb +++ b/app/services/base_service.rb @@ -1,4 +1,5 @@ class BaseService + include Gitlab::Allowable include Gitlab::CurrentSettings attr_accessor :project, :current_user, :params @@ -7,10 +8,6 @@ class BaseService @project, @current_user, @params = project, user, params.dup end - def can?(object, action, subject) - Ability.allowed?(object, action, subject) - end - def notification_service NotificationService.new end |