deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'issue-184' into dev

Browse source 
Conflicts:
	app/views/layouts/project.html.haml
	app/views/projects/_form.html.haml
This commit is contained in:
Aleksei Kvitinskii 2011-11-08 23:19:42 +02:00
commit 1d85197b08
9 changed files with 81 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/project.html.haml
View file

@ -40,5 +40,7 @@
- if @commit
= link_to truncate(commit_name(@project,@commit), :length => 15), project_commit_path(@project, :id => @commit.id), :class => current_page?(:controller => "commits", :action => "show", :project_id => @project, :id => @commit.id) ? "current" : nil
.medium-tags{:style => 'padding: 10px 0 0 10px; width: 210px;'}= tag_list @project
.project-content
= yield