From: Aleksei Kvitinskii <aleksei.wm@gmail.com>
Date: Mon, 7 Nov 2011 19:29:28 +0000 (+0200)
Subject: Merge branch 'dev' into issue-184
X-Git-Tag: v1.2.0pre~38^2~13^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=444b69ddc2382489dbd01304b605c3be5af75f28;p=wvm%2Fgitlab.git

Merge branch 'dev' into issue-184

Conflicts:
	app/views/layouts/project.html.haml
---

444b69ddc2382489dbd01304b605c3be5af75f28
diff --cc app/views/layouts/project.html.haml
index 70ebb8908,984ff4d0d..959cdbe92
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@@@ -16,32 -16,29 +16,32 @@@
        .project-container
          .project-sidebar
            .fixed
 -            %input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo, :class => "one_click_select"}
 -            %aside
 -              = link_to "History", project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil
 -              = link_to "Tree", tree_project_path(@project), :class => current_page?(:controller => "projects", :action => "tree", :id => @project) ? "current" : nil
 -              = link_to "Commits", project_commits_path(@project), :class => current_page?(:controller => "commits", :action => "index", :project_id => @project) ? "current" : nil
 -              = link_to team_project_path(@project), :class => (current_page?(:controller => "projects", :action => "team", :id => @project) || controller.controller_name == "team_members") ? "current" : nil do
 -                Team
 -                - 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
 -                - 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
 -                  %span{ :class => "number" }= @project.common_notes.count
 -              = link_to project_snippets_path(@project), :class => (controller.controller_name == "snippets") ? "current" : nil do
 -                Snippets
 -                - if @project.snippets.count > 0
 -                  %span{ :class => "number" }= @project.snippets.non_expired.count
 -              - 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
 +            %input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo}
 +              %aside
 +                = link_to "History", project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil
 +                = link_to "Tree", tree_project_path(@project), :class => current_page?(:controller => "projects", :action => "tree", :id => @project) ? "current" : nil
 +                = link_to "Commits", project_commits_path(@project), :class => current_page?(:controller => "commits", :action => "index", :project_id => @project) ? "current" : nil
 +                = link_to team_project_path(@project), :class => (current_page?(:controller => "projects", :action => "team", :id => @project) || controller.controller_name == "team_members") ? "current" : nil do
 +                  Team
 +                  - 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
 +                  - if @project.snippets.count > 0
 +                    %span{ :class => "number" }= @project.snippets.non_expired.count
 +                - 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