diff options
| author | James Lopez <james@gitlab.com> | 2019-03-27 10:37:06 +0300 |
|---|---|---|
| committer | James Lopez <james@gitlab.com> | 2019-03-27 10:37:06 +0300 |
| commit | 82da4b1fd43aba9f63e007ad742690ffd868f6c7 (patch) | |
| tree | c9c96c0f85869ada80b02e0e7478741553ea5fbd /app/workers | |
| parent | a41624b910f6581652b546bc868abc64f5f722f4 (diff) | |
| parent | d36415b7545fff543f08a5175790e3a92f383475 (diff) | |
Merge branch 'bvl-allow-more-repos-per-resource-ce' into 'master'
Allow multiple repositories per project
See merge request gitlab-org/gitlab-ce!26539
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/post_receive.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb index a40c865a5e5..396f44396a3 100644 --- a/app/workers/post_receive.rb +++ b/app/workers/post_receive.rb @@ -4,7 +4,7 @@ class PostReceive include ApplicationWorker def perform(gl_repository, identifier, changes, push_options = []) - project, is_wiki = Gitlab::GlRepository.parse(gl_repository) + project, repo_type = Gitlab::GlRepository.parse(gl_repository) if project.nil? log("Triggered hook for non-existing project with gl_repository \"#{gl_repository}\"") @@ -17,7 +17,7 @@ class PostReceive Sidekiq.logger.info "changes: #{changes.inspect}" if ENV['SIDEKIQ_LOG_ARGUMENTS'] post_received = Gitlab::GitPostReceive.new(project, identifier, changes, push_options) - if is_wiki + if repo_type.wiki? process_wiki_changes(post_received) else process_project_changes(post_received) |