Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 0 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 3482b0566ce..a9cb462b326 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -155,6 +155,12 @@ InitializerConnections.with_disabled_database_connections do
           get '/merge_requests/:merge_request_id', to: 'ide#index', constraints: { merge_request_id: /\d+/ }
           get '/', to: 'ide#index'
         end
+
+        # Remote host can contain "." characters so it needs a constraint
+        post 'remote/:remote_host(/*remote_path)',
+             as: :remote,
+             to: 'web_ide/remote_ide#index',
+             constraints: { remote_host: %r{[^/?]+} }
       end
 
       draw :operations