Merge branch 'master' into extend_markdown_upload

2 files changed, 11 insertions, 0 deletions

diff --git a/config/initializers/static_files.rb b/config/initializers/static_files.rb
index 2a6eaec0cc4..bc4fe14bc1a 100644
--- a/config/initializers/static_files.rb
+++ b/config/initializers/static_files.rb
@@ -1,6 +1,11 @@
 begin
   app = Rails.application
 
+  # The `ActionDispatch::Static` middleware intercepts requests for static files 
+  # by checking if they exist in the `/public` directory. 
+  # We're replacing it with our `Gitlab::Middleware::Static` that does the same,
+  # except ignoring `/uploads`, letting those go through to the GitLab Rails app.
+
   app.config.middleware.swap(
     ActionDispatch::Static, 
     Gitlab::Middleware::Static, 
diff --git a/config/routes.rb b/config/routes.rb
index 3d826bf5599..a2ee5f9dc26 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -67,6 +67,12 @@ Gitlab::Application.routes.draw do
       get :callback
       get :jobs
     end
+
+    resource :gitorious, only: [:create, :new], controller: :gitorious do
+      get :status
+      get :callback
+      get :jobs
+    end
   end
 
   #