diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-27 18:08:16 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-27 18:08:16 +0300 |
| commit | fb73ca3398c2ac49a616ab553e117b0586089702 (patch) | |
| tree | c2f787ac97df38569c59cd0e967331ec1ead6d7e /lib/api/internal/base.rb | |
| parent | b6b8f7dc871e73f29af55f06a773136a7242df57 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/internal/base.rb')
| -rw-r--r-- | lib/api/internal/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/internal/base.rb b/lib/api/internal/base.rb index 50142b8641e..11f2a2ea1c0 100644 --- a/lib/api/internal/base.rb +++ b/lib/api/internal/base.rb @@ -224,9 +224,9 @@ module API response.add_merge_request_urls(merge_request_urls) - # A user is not guaranteed to be returned; an orphaned write deploy + # Neither User nor Project are guaranteed to be returned; an orphaned write deploy # key could be used - if user + if user && project redirect_message = Gitlab::Checks::ProjectMoved.fetch_message(user.id, project.id) project_created_message = Gitlab::Checks::ProjectCreated.fetch_message(user.id, project.id) |