Merge branch 'master' of github.com:gitlabhq/gitlabhq

1 files changed, 18 insertions, 0 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 3e7d9f78710..5b69d06eb76 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -441,6 +441,24 @@ Rails.application.routes.draw do
         end
 
         scope do
+          get(
+            '/find_file/*id',
+            to: 'find_file#show',
+            constraints: { id: /.+/, format: /html/ },
+            as: :find_file
+          )
+        end
+
+        scope do
+          get(
+            '/files/*id',
+            to: 'find_file#list',
+            constraints: { id: /(?:[^.]|\.(?!json$))+/, format: /json/ },
+            as: :files
+          )
+        end
+
+        scope do
           post(
             '/create_dir/*id',
               to: 'tree#create_dir',