Download as
Browse Code »

Commit 94f04939990400c60be3d345d69d42d0f05e8355

Authored by Dmitriy Zaporozhets
1 parent 71ab011a
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

few fixes afte merge gollum wiki

Showing 2 changed files with 1 additions and 13 deletions   Show diff stats
app/views/wikis/_nav.html.haml
  Diff comments   View file @94f0493
1 1 %ul.nav.nav-tabs
2 2 - if @project.wiki_enabled
3 3 = nav_link(controller: 'wikis') do
4   - = link_to 'Wiki', project_wiki_path(@project, :index)
  4 + = link_to 'Wiki', project_wiki_path(@project, :home)
5 5  
6 6 - if @project.wall_enabled
7 7 = nav_link(path: 'projects#wall') do
... ...
app/views/wikis/show.html.haml
  Diff comments   View file @94f0493
... ... @@ -9,18 +9,6 @@
9 9 You can view the #{link_to "most recent version", project_wiki_path(@project, @wiki)} or browse the #{link_to "history", history_project_wiki_path(@project, @wiki)}.
10 10  
11 11 .file_holder
12   - .file_title
13   - = @wiki.title
14   - %span.options
15   - = link_to pages_project_wikis_path(@project), class: "btn btn-tiny grouped" do
16   - Pages
17   - - if can? current_user, :write_wiki, @project
18   - = link_to history_project_wiki_path(@project, @wiki), class: "btn btn-tiny grouped" do
19   - History
20   - = link_to edit_project_wiki_path(@project, @wiki), class: "btn btn-tiny grouped" do
21   - %i.icon-edit
22   - Edit
23   -
24 12 .file_content.wiki
25 13 = preserve do
26 14 = render_wiki_content(@wiki)
... ...