diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 21:06:15 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 21:06:15 +0000 |
commit | 188a57f93bba5953800de490fcc6246966a073fd (patch) | |
tree | 18172d7f6dcb48e31dd54d00140f5733c1857db6 | |
parent | 40d3d574132d2849646c20eb9d8742b159d9bfc8 (diff) | |
download | gitlab-ce-188a57f93bba5953800de490fcc6246966a073fd.tar.gz |
Add latest changes from gitlab-org/gitlab@master
-rw-r--r-- | config/routes/project.rb | 6 | ||||
-rw-r--r-- | lib/api/internal/base.rb | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 29e462f904d..14caae35a83 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -1,5 +1,11 @@ resources :projects, only: [:index, :new, :create] +Gitlab.ee do + scope "/-/push_from_secondary/:geo_node_id" do + draw :git_http + end +end + draw :git_http get '/projects/:id' => 'projects#resolve' diff --git a/lib/api/internal/base.rb b/lib/api/internal/base.rb index cde7b0e1eea..d5f0ddb0805 100644 --- a/lib/api/internal/base.rb +++ b/lib/api/internal/base.rb @@ -22,6 +22,10 @@ module API # easily. project.http_url_to_repo end + + def ee_post_receive_response_hook(response) + # Hook for EE to add messages + end end namespace 'internal' do @@ -265,6 +269,8 @@ module API response.add_basic_message(project_created_message) end + ee_post_receive_response_hook(response) + present response, with: Entities::InternalPostReceive::Response end end |