Add latest changes from gitlab-org/gitlab@master

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