diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-03-07 21:42:57 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-03-07 21:42:57 +0300 |
| commit | 318aeffcd735486ff3bbb99325825788918373c7 (patch) | |
| tree | 27a916e9bfa9a7f31ead5f5c53c6a366ea8730f9 /app/workers/emails_on_push_worker.rb | |
| parent | b9f9e6fa4e7a54d6caee81799ed88ee40dfb645b (diff) | |
| parent | 67185097734bb88979df020123cf7327bc5d32c5 (diff) | |
[ci skip] Merge branch 'master' into 43770-change-clear-runners-cache-ujs-action-to-an-axios-request
* master: (68 commits)
Upgrade Workhorse to 4.0.0
naming things
Update GitLab Pages to v0.7.0
Minor fixes in API doc
Use Project#full_name instead of name_with_namespace
Fix tests not completely disabling Gitaly
Move OperationService#UserRemoveBranch
Move OperationService#UserCreateBranch
Move CommitService#Languages to OPT_OUT
Move RefService#CreateBranch to OPT_OUT
Move RefService#DeleteBranch to OPT_OUT
Move OperationService#UserRevert to OPT_OUT
Move OperationService#UserAddTag to OPT_OUT
Move CommitService::CommitPatch to OPT_OUT
Change to Pacific Time Zone
Merge branch 'pages-6-1-gitlab-10-5' into 'security-10-5'
Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5'
Remove wrong assumption about Runners cache GC
Add CommonMark markdown engine
add nginx_status monitoring details
...
Diffstat (limited to 'app/workers/emails_on_push_worker.rb')
| -rw-r--r-- | app/workers/emails_on_push_worker.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/workers/emails_on_push_worker.rb b/app/workers/emails_on_push_worker.rb index 21da27973fe..2a4d65b5cb3 100644 --- a/app/workers/emails_on_push_worker.rb +++ b/app/workers/emails_on_push_worker.rb @@ -66,7 +66,7 @@ class EmailsOnPushWorker # These are input errors and won't be corrected even if Sidekiq retries rescue Net::SMTPFatalError, Net::SMTPSyntaxError => e - logger.info("Failed to send e-mail for project '#{project.name_with_namespace}' to #{recipient}: #{e}") + logger.info("Failed to send e-mail for project '#{project.full_name}' to #{recipient}: #{e}") end end ensure |