diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-03-07 16:12:13 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-03-07 16:12:13 +0000 |
commit | 125793f15a4d6ff1c5e853412032fd07c5069842 (patch) | |
tree | f0483035bb74c953465ef5fa5b8ef1cdd5abbc72 /app | |
parent | 82ea46a7077786382aa9e6871a8c350df66f1ba2 (diff) | |
parent | aeab4e62637cd67f9c2ddd64589f3c9cca1ee895 (diff) | |
download | gitlab-ce-125793f15a4d6ff1c5e853412032fd07c5069842.tar.gz |
Merge branch 'dz-use-less-deprecated-methods-2' into 'master'
Use Project#full_name instead of name_with_namespace
See merge request gitlab-org/gitlab-ce!17601
Diffstat (limited to 'app')
-rw-r--r-- | app/mailers/notify.rb | 2 | ||||
-rw-r--r-- | app/services/projects/create_service.rb | 2 | ||||
-rw-r--r-- | app/workers/emails_on_push_worker.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index 45d4fb451d8..e4212775956 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -117,7 +117,7 @@ class Notify < BaseMailer if Gitlab::IncomingEmail.enabled? && @sent_notification address = Mail::Address.new(Gitlab::IncomingEmail.reply_address(reply_key)) - address.display_name = @project.name_with_namespace + address.display_name = @project.full_name headers['Reply-To'] = address diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb index 01838ec6b5d..7fa1387084c 100644 --- a/app/services/projects/create_service.rb +++ b/app/services/projects/create_service.rb @@ -85,7 +85,7 @@ module Projects end def after_create_actions - log_info("#{@project.owner.name} created a new project \"#{@project.name_with_namespace}\"") + log_info("#{@project.owner.name} created a new project \"#{@project.full_name}\"") unless @project.gitlab_project_import? @project.write_repository_config 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 |