diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-19 12:14:10 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-19 12:14:10 +0300 |
| commit | a87e8cad90b7d6d602cb5701d1dc588587684597 (patch) | |
| tree | cd115fd058a7b982723fd7abf6d7251bfdba2ff8 /app/services/resource_access_tokens | |
| parent | 7aa48fbe89286a7aac3638d38dac909396f7b917 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/resource_access_tokens')
| -rw-r--r-- | app/services/resource_access_tokens/create_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/resource_access_tokens/create_service.rb b/app/services/resource_access_tokens/create_service.rb index af0feef4eaa..28ea1ac8296 100644 --- a/app/services/resource_access_tokens/create_service.rb +++ b/app/services/resource_access_tokens/create_service.rb @@ -75,7 +75,8 @@ module ResourceAccessTokens end def generate_email - email_pattern = "#{resource_type}#{resource.id}_bot%s@example.com" + # Default emaildomain need to be reworked. See gitlab-org/gitlab#260305 + email_pattern = "#{resource_type}#{resource.id}_bot%s@noreply.#{Gitlab.config.gitlab.host}" uniquify.string(-> (n) { Kernel.sprintf(email_pattern, n) }) do |s| User.find_by_email(s) |