diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-12-25 10:10:28 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-12-25 10:10:28 +0300 |
commit | 228f42b58b8f23b53494d32ff964aca47e90ac2e (patch) | |
tree | 735809a3269588affde298a1758db15b0003759a /lib | |
parent | d6e16693dcfe24df35508fad6d2f03f3d26c0765 (diff) | |
parent | 36bdf3dc9ac290058b73ab54abeb9ba84b211b29 (diff) |
Merge branch 'sh-handle-orphaned-deploy-keys' into 'master'
Gracefully handle orphaned write deploy keys in /internal/post_receive
Closes #41466
See merge request gitlab-org/gitlab-ce!16127
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/internal.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb index ccaaeca10d4..79b302aae70 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -190,9 +190,12 @@ module API project = Gitlab::GlRepository.parse(params[:gl_repository]).first user = identify(params[:identifier]) - redirect_message = Gitlab::Checks::ProjectMoved.fetch_redirect_message(user.id, project.id) - if redirect_message - output[:redirected_message] = redirect_message + + # A user is not guaranteed to be returned; an orphaned write deploy + # key could be used + if user + redirect_message = Gitlab::Checks::ProjectMoved.fetch_redirect_message(user.id, project.id) + output[:redirected_message] = redirect_message if redirect_message end output |