summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-09-12 22:20:12 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-09-12 22:20:12 +0800
commit985252126de7f98c021f3138a720969696440687 (patch)
tree1ecc571076a1ff274339e40f7be5bd9dca098e49 /app/mailers
parent5de54a7137ee6de121e5c3477b4901a183b01762 (diff)
parent12d4eea4c7a46ad3641f2c3a8ee182a16e4848e5 (diff)
downloadgitlab-ce-985252126de7f98c021f3138a720969696440687.tar.gz
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 ...
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/base_mailer.rb2
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