From c6ed2b058b5ab5fb435114491889676732aefcb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= Date: Mon, 3 Jul 2017 11:00:18 -0400 Subject: Revert "Merge branch '86-follow-up-from-use-gl_repository-if-present-when-enqueing-sidekiq-postreceive-jobs' into 'master'" This reverts commit fa6343515ba65423e9de4c98c6005facc6059938, reversing changes made to 62af7f6af72728cecb98c5275d8b7aeb3953e564. --- lib/gitlab_post_receive.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lib/gitlab_post_receive.rb') diff --git a/lib/gitlab_post_receive.rb b/lib/gitlab_post_receive.rb index ac2ee5e..00a1b1b 100644 --- a/lib/gitlab_post_receive.rb +++ b/lib/gitlab_post_receive.rb @@ -33,11 +33,11 @@ class GitlabPostReceive end merge_request_urls = GitlabMetrics.measure("merge-request-urls") do - api.merge_request_urls(gl_repository, changes) + api.merge_request_urls(@gl_repository, @repo_path, @changes) end print_merge_request_links(merge_request_urls) - api.notify_post_receive(gl_repository) + api.notify_post_receive(gl_repository, repo_path) rescue GitlabNet::ApiUnreachableError nil end @@ -107,11 +107,14 @@ class GitlabPostReceive def update_redis # Encode changes as base64 so we don't run into trouble with non-UTF-8 input. changes = Base64.encode64(@changes) + # TODO: Change to `@gl_repository` in next release. + # See https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/130#note_28747613 + project_identifier = @gl_repository || @repo_path queue = "#{config.redis_namespace}:queue:post_receive" msg = JSON.dump({ 'class' => 'PostReceive', - 'args' => [@gl_repository, @actor, changes], + 'args' => [project_identifier, @actor, changes], 'jid' => @jid, 'enqueued_at' => Time.now.to_f }) -- cgit v1.2.1