diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2011-11-13 15:57:34 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2011-11-13 15:57:34 +0200 |
| commit | 762946995ea9d477f00fea19e5040bf4dd437cb9 (patch) | |
| tree | b94dc6074eeba1b49c0ed6427cb847f89227fd4f /app/views/layouts/project.html.haml | |
| parent | dc844f013848ee1fa7721173bda3f3fc0ed0b8ba (diff) | |
| parent | 2f790001a029144f7a614d49a123cd1037f6398c (diff) | |
| download | gitlab-ce-762946995ea9d477f00fea19e5040bf4dd437cb9.tar.gz | |
Merge remote-tracking branch 'origin/master' into network_graph
Conflicts:
app/assets/stylesheets/projects.css.scss
lib/commit_ext.rb
Diffstat (limited to 'app/views/layouts/project.html.haml')
| -rw-r--r-- | app/views/layouts/project.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index fc28b9307b3..8ef88f9d427 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -19,7 +19,7 @@ .git_url_wrapper %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 "Activities", 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 "Network graph", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil |