root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix blob and repo stuff after gitlab_git v3

This commit is contained in:
Dmitriy Zaporozhets 2013-10-01 18:26:55 +03:00
parent 836c870cc9
commit 1d3f03fb69
6 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/stylesheets/gitlab_bootstrap/files.scss
View File

@ -69,6 +69,12 @@
} }
&.blob-no-preview {
background: #eee;
text-shadow: 0 1px 2px #FFF;
padding: 100px 0;
}
/** /**
* Blame file * Blame file
*/ */

2
app/controllers/projects/blob_controller.rb
View File

@ -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

2
app/models/repository.rb
View File

@ -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

11
app/views/projects/blob/_download.html.haml
View File

@ -1,8 +1,7 @@
.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})

6
lib/api/repositories.rb
View File

@ -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
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

2
lib/extracts_path.rb
View File

@ -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)