Merge remote-tracking branch 'upstream/master' into pipeline-emails

* upstream/master: (671 commits)
  Only check :can_resolve permission if the note is resolvable
  Use Search::GlobalService.new in the `GET /projects/search/:query` endpoint
  Improve PipelinesFinder spec so that it does not depend on hard-coded database IDs
  Add changelogs/unreleased/.gitkeep
  Archive CHANGELOG entries prior to 8.0 in changelogs/archive.md
  Request only the LDAP attributes we need
  Add notification_settings API calls Use NotificationSetting::EMAIL_EVENTS for params
  Pull import sources from Gitlab::ImportSources
  Fix API issues sorting
  Use gitlab-workhorse 0.8.1
  Update CHANGELOG
  Avoid conflict with admin labels when importing GitHub labels
  Search should compare only the lowercase versions of the project names
  Enable pipeline events by default
  Minor update on CI docs examples
  Move write_note into SlashCommandsHelper and update other dependent specs
  Wait for logout message in login_helpers
  Use wait_for_ajax to avoid database deadlocks after specs are cleaned
  Fix spec failures with spec/features/issues/user_uses_slash_commands_spec.rb
  Require comments must be included before code
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/app/mailers/base_mailer.rb b/app/mailers/base_mailer.rb
index 8b83bbd93b7..61a574d3dc0 100644
--- a/app/mailers/base_mailer.rb
+++ b/app/mailers/base_mailer.rb
@@ -9,7 +9,7 @@ class BaseMailer < ActionMailer::Base
   default reply_to: Proc.new { default_reply_to_address.format }
 
   def can?
-    Ability.abilities.allowed?(current_user, action, subject)
+    Ability.allowed?(current_user, action, subject)
   end
 
   private