remove last commit widget, added repo size and owner info on project home page
This commit is contained in:
parent
e90277f9b5
commit
ca9098d898
5 changed files with 37 additions and 17 deletions
|
@ -59,7 +59,6 @@ class ProjectsController < ProjectResourceController
|
||||||
format.html do
|
format.html do
|
||||||
if @project.repository && !@project.repository.empty?
|
if @project.repository && !@project.repository.empty?
|
||||||
@last_push = current_user.recent_push(@project.id)
|
@last_push = current_user.recent_push(@project.id)
|
||||||
@last_commit = CommitDecorator.decorate(@project.repository.commit)
|
|
||||||
render :show
|
render :show
|
||||||
else
|
else
|
||||||
render "projects/empty"
|
render "projects/empty"
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
class Repository
|
class Repository
|
||||||
|
include Gitlab::Popen
|
||||||
|
|
||||||
# Repository directory name with namespace direcotry
|
# Repository directory name with namespace direcotry
|
||||||
# Examples:
|
# Examples:
|
||||||
# gitlab/gitolite
|
# gitlab/gitolite
|
||||||
|
@ -147,4 +149,21 @@ class Repository
|
||||||
|
|
||||||
file_path
|
file_path
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Return repo size in megabytes
|
||||||
|
# Cached in redis
|
||||||
|
def size
|
||||||
|
Rails.cache.fetch(cache_key(:size)) do
|
||||||
|
size = popen('du -s', path_to_repo).first.strip.to_i
|
||||||
|
(size.to_f / 1024).round(2)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def expire_cache
|
||||||
|
Rails.cache.delete(cache_key(:size))
|
||||||
|
end
|
||||||
|
|
||||||
|
def cache_key(type)
|
||||||
|
"#{type}:#{path_with_namespace}"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -23,6 +23,7 @@ class GitPushService
|
||||||
|
|
||||||
project.ensure_satellite_exists
|
project.ensure_satellite_exists
|
||||||
project.discover_default_branch
|
project.discover_default_branch
|
||||||
|
project.repository.expire_cache
|
||||||
|
|
||||||
if push_to_branch?(ref, oldrev)
|
if push_to_branch?(ref, oldrev)
|
||||||
project.update_merge_requests(oldrev, newrev, ref, @user)
|
project.update_merge_requests(oldrev, newrev, ref, @user)
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
.commit
|
|
||||||
%p
|
|
||||||
%time.committed_ago{ datetime: commit.committed_date, title: commit.committed_date.stamp("Aug 21, 2011 9:23pm") }
|
|
||||||
= time_ago_in_words(commit.committed_date)
|
|
||||||
ago
|
|
||||||
|
|
||||||
= commit.author_link avatar: true, size: 16
|
|
||||||
%p
|
|
||||||
= link_to commit.short_id(8), project_commit_path(@project, commit), class: "commit_short_id"
|
|
||||||
|
|
||||||
= link_to_gfm truncate(commit.title, length: 30), project_commit_path(@project, commit.id), class: "row_title"
|
|
|
@ -3,19 +3,31 @@
|
||||||
= render "events/event_last_push", event: @last_push
|
= render "events/event_last_push", event: @last_push
|
||||||
|
|
||||||
.row
|
.row
|
||||||
.span8
|
.span9
|
||||||
.content_list= render @events
|
.content_list= render @events
|
||||||
.loading.hide
|
.loading.hide
|
||||||
.span4
|
.span3
|
||||||
.ui-box.white
|
.ui-box.white
|
||||||
.padded
|
.padded
|
||||||
%h3.page_title
|
%h3.page_title
|
||||||
= @project.name
|
= @project.name
|
||||||
%hr
|
|
||||||
- if @project.description.present?
|
- if @project.description.present?
|
||||||
%p.light= @project.description
|
%p.light= @project.description
|
||||||
|
|
||||||
%h5 Last commit:
|
%hr
|
||||||
= render 'last_commit', commit: @last_commit
|
%p
|
||||||
|
Access level:
|
||||||
|
- if @project.public
|
||||||
|
%span.cblue
|
||||||
|
%i.icon-share
|
||||||
|
Public
|
||||||
|
- else
|
||||||
|
%span.cgreen
|
||||||
|
%i.icon-lock
|
||||||
|
Private
|
||||||
|
|
||||||
|
%p Repo Size: #{@project.repository.size} MB
|
||||||
|
%p Created at: #{@project.created_at.stamp('Aug 22, 2013')}
|
||||||
|
%p Owner: #{link_to @project.owner_name, @project.owner}
|
||||||
:javascript
|
:javascript
|
||||||
$(function(){ Pager.init(20); });
|
$(function(){ Pager.init(20); });
|
||||||
|
|
Loading…
Reference in a new issue