From: Dmitriy Zaporozhets Date: Fri, 15 Mar 2013 07:39:07 +0000 (+0200) Subject: rename writeboards to wiki X-Git-Tag: v5.0.0~66^2~2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5bf88506ecbc2fd57f0103cd3d8ce394a82954b5;p=wvm%2Fgitlab.git rename writeboards to wiki --- diff --git a/app/views/layouts/project_resource.html.haml b/app/views/layouts/project_resource.html.haml index 9ccb60d52..8dd84f7c0 100644 --- a/app/views/layouts/project_resource.html.haml +++ b/app/views/layouts/project_resource.html.haml @@ -36,7 +36,7 @@ %span.count.merge_counter= @project.merge_requests.opened.count = nav_link(html_options: {class: "#{project_writeboards_tab_class}"}) do - = link_to 'Writeboards', project_wiki_path(@project, :index) + = link_to 'Wiki', project_wiki_path(@project, :index) - if can? current_user, :admin_project, @project = nav_link(html_options: {class: "#{project_tab_class}"}) do diff --git a/app/views/wikis/show.html.haml b/app/views/wikis/show.html.haml index 7984c61c9..ff18541cd 100644 --- a/app/views/wikis/show.html.haml +++ b/app/views/wikis/show.html.haml @@ -11,6 +11,7 @@ .file_title = link_to '#', class: 'wiki-fullscreen' do %i.icon-resize-horizontal +   = @wiki.title %span.options = link_to pages_project_wikis_path(@project), class: "btn btn-tiny grouped" do