Commit 5bf88506ecbc2fd57f0103cd3d8ce394a82954b5
1 parent
2681a01b
Exists in
master
and in
4 other branches
rename writeboards to wiki
Showing
2 changed files
with
2 additions
and
1 deletions
Show diff stats
app/views/layouts/project_resource.html.haml
| @@ -36,7 +36,7 @@ | @@ -36,7 +36,7 @@ | ||
| 36 | %span.count.merge_counter= @project.merge_requests.opened.count | 36 | %span.count.merge_counter= @project.merge_requests.opened.count |
| 37 | 37 | ||
| 38 | = nav_link(html_options: {class: "#{project_writeboards_tab_class}"}) do | 38 | = nav_link(html_options: {class: "#{project_writeboards_tab_class}"}) do |
| 39 | - = link_to 'Writeboards', project_wiki_path(@project, :index) | 39 | + = link_to 'Wiki', project_wiki_path(@project, :index) |
| 40 | 40 | ||
| 41 | - if can? current_user, :admin_project, @project | 41 | - if can? current_user, :admin_project, @project |
| 42 | = nav_link(html_options: {class: "#{project_tab_class}"}) do | 42 | = nav_link(html_options: {class: "#{project_tab_class}"}) do |
app/views/wikis/show.html.haml
| @@ -11,6 +11,7 @@ | @@ -11,6 +11,7 @@ | ||
| 11 | .file_title | 11 | .file_title |
| 12 | = link_to '#', class: 'wiki-fullscreen' do | 12 | = link_to '#', class: 'wiki-fullscreen' do |
| 13 | %i.icon-resize-horizontal | 13 | %i.icon-resize-horizontal |
| 14 | + | ||
| 14 | = @wiki.title | 15 | = @wiki.title |
| 15 | %span.options | 16 | %span.options |
| 16 | = link_to pages_project_wikis_path(@project), class: "btn btn-tiny grouped" do | 17 | = link_to pages_project_wikis_path(@project), class: "btn btn-tiny grouped" do |