diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-10-26 21:06:25 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-10-26 21:06:25 +0300 |
| commit | e997b22df50a46759cac9936a6557993310f8888 (patch) | |
| tree | 7477ee5da963ef699652ccc84fc4fee8726babad /app | |
| parent | f2e9148d18c049bb699e60ed31d3804f9ae4b592 (diff) | |
| parent | 679d9b21b7aac55796ef59d5694b7d2e0fb40b35 (diff) | |
Merge branch '51335-fail-early-when-user-cannot-be-identified' into 'master'
User not defined in PostReceive#process_project_changes
Closes #51335
See merge request gitlab-org/gitlab-ce!22519
Diffstat (limited to 'app')
| -rw-r--r-- | app/workers/post_receive.rb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb index 09a594cdb4e..72a1733a2a8 100644 --- a/app/workers/post_receive.rb +++ b/app/workers/post_receive.rb @@ -29,15 +29,14 @@ class PostReceive def process_project_changes(post_received) changes = [] refs = Set.new + @user = post_received.identify - post_received.changes_refs do |oldrev, newrev, ref| - @user ||= post_received.identify(newrev) - - unless @user - log("Triggered hook for non-existing user \"#{post_received.identifier}\"") - return false # rubocop:disable Cop/AvoidReturnFromBlocks - end + unless @user + log("Triggered hook for non-existing user \"#{post_received.identifier}\"") + return false + end + post_received.changes_refs do |oldrev, newrev, ref| if Gitlab::Git.tag_ref?(ref) GitTagPushService.new(post_received.project, @user, oldrev: oldrev, newrev: newrev, ref: ref).execute elsif Gitlab::Git.branch_ref?(ref) |