Commit 1d3f03fb authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix blob and repo stuff after gitlab_git v3

parent 836c870c
...@@ -69,6 +69,12 @@ ...@@ -69,6 +69,12 @@
} }
&.blob-no-preview {
background: #eee;
text-shadow: 0 1px 2px #FFF;
padding: 100px 0;
}
/** /**
* Blame file * Blame file
*/ */
......
...@@ -9,5 +9,7 @@ class Projects::BlobController < Projects::ApplicationController ...@@ -9,5 +9,7 @@ class Projects::BlobController < Projects::ApplicationController
def show def show
@blob = Gitlab::Git::Blob.find(@repository, @commit.id, @path) @blob = Gitlab::Git::Blob.find(@repository, @commit.id, @path)
not_found! unless @blob
end end
end end
...@@ -5,7 +5,7 @@ class Repository ...@@ -5,7 +5,7 @@ class Repository
def initialize(path_with_namespace, default_branch) def initialize(path_with_namespace, default_branch)
@path_with_namespace = path_with_namespace @path_with_namespace = path_with_namespace
@raw_repository = Gitlab::Git::Repository.new(path_to_repo) @raw_repository = Gitlab::Git::Repository.new(path_to_repo) if path_with_namespace
rescue Gitlab::Git::Repository::NoRepository rescue Gitlab::Git::Repository::NoRepository
nil nil
end end
......
.file-content.blob_file .file-content.blob_file.blob-no-preview
%center %center
= link_to project_raw_path(@project, @id) do = link_to project_raw_path(@project, @id) do
%div.padded %h1.light
%h4 %i.icon-download-alt
%i.icon-download-alt %h4
%br Download (#{number_to_human_size blob.size})
Download (#{number_to_human_size blob.size})
...@@ -139,7 +139,7 @@ module API ...@@ -139,7 +139,7 @@ module API
path = params[:path] || nil path = params[:path] || nil
commit = user_project.repository.commit(ref) commit = user_project.repository.commit(ref)
tree = Tree.new(user_project.repository, commit.id, ref, path) tree = Tree.new(user_project.repository, commit.id, path)
trees = [] trees = []
...@@ -168,8 +168,8 @@ module API ...@@ -168,8 +168,8 @@ module API
commit = repo.commit(ref) commit = repo.commit(ref)
not_found! "Commit" unless commit not_found! "Commit" unless commit
blob = Gitlab::Git::Blob.new(repo, commit.id, ref, params[:filepath]) blob = Gitlab::Git::Blob.find(repo, commit.id, params[:filepath])
not_found! "File" unless blob.exists? not_found! "File" unless blob
env['api.format'] = :txt env['api.format'] = :txt
......
...@@ -107,6 +107,8 @@ module ExtractsPath ...@@ -107,6 +107,8 @@ module ExtractsPath
@commit = @repo.commit(@options[:extended_sha1]) @commit = @repo.commit(@options[:extended_sha1])
end end
raise InvalidPathError unless @commit
@hex_path = Digest::SHA1.hexdigest(@path) @hex_path = Digest::SHA1.hexdigest(@path)
@logs_path = logs_file_project_ref_path(@project, @ref, @path) @logs_path = logs_file_project_ref_path(@project, @ref, @path)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment