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

Merge branch 'dev' into issue-184

Browse source 
Conflicts:
	app/views/layouts/project.html.haml
This commit is contained in:
Aleksei Kvitinskii 2011-11-07 21:29:28 +02:00
commit 444b69ddc2
17 changed files with 106 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,12 +26,12 @@
- if @project.users_projects.count > 0
%span{ :class => "number" }= @project.users_projects.count
= link_to project_issues_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
Issues
Issuess
- if @project.issues.opened.count > 0
%span{ :class => "number" }= @project.issues.opened.count
= link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
Wall
- if @project.common_notes.count > 0
- if @project.common_nsotes.count > 0
%span{ :class => "number" }= @project.common_notes.count
= link_to project_snippets_path(@project), :class => (controller.controller_name == "snippets") ? "current" : nil do
Snippets