Merge branch 'master' into simplify_controllers2

Conflicts:
	app/controllers/commits_controller.rb
	app/controllers/refs_controller.rb

1 files changed, 37 insertions, 0 deletions

diff --git a/app/controllers/blob_controller.rb b/app/controllers/blob_controller.rb
new file mode 100644
index 00000000000..33387842ec2
--- /dev/null
+++ b/app/controllers/blob_controller.rb
@@ -0,0 +1,37 @@
+# Controller for viewing a file's blame
+class BlobController < ApplicationController
+  include ExtractsPath
+  include Gitlab::Encode
+
+  layout "project"
+
+  before_filter :project
+
+  # Authorize
+  before_filter :add_project_abilities
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  before_filter :assign_ref_vars
+
+  def show
+    if @tree.is_blob?
+      if @tree.text?
+        encoding = detect_encoding(@tree.data)
+        mime_type = encoding ? "text/plain; charset=#{encoding}" : "text/plain"
+      else
+        mime_type = @tree.mime_type
+      end
+
+      send_data(
+        @tree.data,
+        type: mime_type,
+        disposition: 'inline',
+        filename: @tree.name
+      )
+    else
+      not_found!
+    end
+  end
+end