diff options
| author | Régis Freyd (GitLab) <regis@gitlab.com> | 2016-09-06 14:06:16 +0000 |
|---|---|---|
| committer | Régis Freyd (GitLab) <regis@gitlab.com> | 2016-09-06 14:06:16 +0000 |
| commit | b44636c259e7a655a60cc2b98431d6d00a73e002 (patch) | |
| tree | 93545ea821319c23410a444f676c8e5a66daeecf /app/services/base_service.rb | |
| parent | 310beb9002f1bbdd07abe5bba6712769773a99b2 (diff) | |
| parent | e9e8c67fb7d58288dbac1777b63ea7d3128d6268 (diff) | |
| download | gitlab-ce-email-in-slash-commands.tar.gz | |
Merge branch 'master' into 'email-in-slash-commands'email-in-slash-commands
# Conflicts:
# doc/user/project/slash_commands.md
# doc/workflow/README.md
Diffstat (limited to 'app/services/base_service.rb')
| -rw-r--r-- | app/services/base_service.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/services/base_service.rb b/app/services/base_service.rb index 0d55ba5a981..0c208150fb8 100644 --- a/app/services/base_service.rb +++ b/app/services/base_service.rb @@ -7,12 +7,8 @@ class BaseService @project, @current_user, @params = project, user, params.dup end - def abilities - Ability.abilities - end - def can?(object, action, subject) - abilities.allowed?(object, action, subject) + Ability.allowed?(object, action, subject) end def notification_service |