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

Merge branch 'wiki'

Browse source 
Conflicts:
	app/views/layouts/_project_menu.html.haml
This commit is contained in:
Dmitriy Zaporozhets 2012-02-21 20:32:43 +02:00
commit ce8eba8913
22 changed files with 294 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/views/layouts/_project_menu.html.haml
View file

@ -12,7 +12,6 @@
= link_to project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
Issues
%span.count= @project.issues.opened.count
- if @project.merge_requests_enabled
= link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do
Merge Requests
@ -21,3 +20,7 @@
- if @project.wall_enabled
= link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
Wall
- if @project.wiki_enabled
= link_to project_wiki_path(@project, :index), :class => (controller.controller_name == "wikis") ? "current" : nil do
Wiki