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

2 files changed, 28 insertions, 0 deletions

diff --git a/app/controllers/projects/find_file_controller.rb b/app/controllers/projects/find_file_controller.rb
new file mode 100644
index 00000000000..54a0c447aee
--- /dev/null
+++ b/app/controllers/projects/find_file_controller.rb
@@ -0,0 +1,26 @@
+# Controller for viewing a repository's file structure

+class Projects::FindFileController < Projects::ApplicationController

+  include ExtractsPath

+  include ActionView::Helpers::SanitizeHelper

+  include TreeHelper

+

+  before_action :require_non_empty_project

+  before_action :assign_ref_vars

+  before_action :authorize_download_code!

+

+  def show

+    return render_404 unless @repository.commit(@ref)

+

+    respond_to do |format|

+      format.html

+    end

+  end

+

+  def list

+    file_paths = @repo.ls_files(@ref)

+

+    respond_to do |format|

+      format.json { render json: file_paths }

+    end

+  end

+end

diff --git a/app/controllers/projects/refs_controller.rb b/app/controllers/projects/refs_controller.rb
index c4e18c17077..a8f091819ca 100644
--- a/app/controllers/projects/refs_controller.rb
+++ b/app/controllers/projects/refs_controller.rb
@@ -20,6 +20,8 @@ class Projects::RefsController < Projects::ApplicationController
             namespace_project_network_path(@project.namespace, @project, @id, @options)
           when "graphs"
             namespace_project_graph_path(@project.namespace, @project, @id)
+          when "find_file"
+            namespace_project_find_file_path(@project.namespace, @project, @id)
           when "graphs_commits"
             commits_namespace_project_graph_path(@project.namespace, @project, @id)
           else