Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox...

Conflicts:
	app/views/layouts/project_resource.html.haml
	app/views/wikis/edit.html.haml
	app/views/wikis/pages.html.haml
	app/views/wikis/show.html.haml
	spec/features/gitlab_flavored_markdown_spec.rb

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/assets/stylesheets/application.scss
Simple merge

diff --cc app/views/layouts/project_resource.html.haml
index e4558b6,3c53c0f..dfbb6a0
--- 1/app/views/layouts/project_resource.html.haml
--- 2/app/views/layouts/project_resource.html.haml
+++ b/app/views/layouts/project_resource.html.haml
@@@ -35,11 -35,12 +35,11 @@@
                Merge Requests
                %span.count.merge_counter= @project.merge_requests.opened.count
  
 -        - if @project.wall_enabled
 -          = nav_link(path: 'projects#wall') do
 -            = link_to 'Wall', wall_project_path(@project)
 -
 -        - if @project.wiki_enabled
 -          = nav_link(controller: :wikis) do
 -            = link_to 'Wiki', project_wiki_path(@project, :home)
 +        = nav_link(html_options: {class: "#{project_wiki_tab_class}"}) do
-           = link_to 'Wiki', project_wiki_path(@project, :index)
++          = link_to 'Wiki', project_wiki_path(@project, :home)
  
 +        - if can? current_user, :admin_project, @project
 +          = nav_link(html_options: {class: "#{project_tab_class}"}) do
 +            = link_to edit_project_path(@project), class: "stat-tab tab " do
 +              Settings
        .content= yield

diff --cc app/views/wikis/edit.html.haml
index 501ba09,84d8d27..dd200a3
--- 1/app/views/wikis/edit.html.haml
--- 2/app/views/wikis/edit.html.haml
+++ b/app/views/wikis/edit.html.haml
@@@ -1,4 -1,7 +1,6 @@@
- %h3.page_title Editing page
+ %h3.page_title
+   Editing page
+   = render partial: 'main_links'
 -%hr
  = render 'form'
  
  .pull-right

diff --cc app/views/wikis/pages.html.haml
index 7bf57ad,fe35a2e..eb65599
--- 1/app/views/wikis/pages.html.haml
--- 2/app/views/wikis/pages.html.haml
+++ b/app/views/wikis/pages.html.haml
@@@ -1,5 -1,6 +1,7 @@@
- %h3.page_title All Pages
 += render 'wikis/nav'
+ %h3.page_title
+   All Pages
+   = render partial: 'main_links'
  %br
  %table
    %thead

diff --cc app/views/wikis/show.html.haml
index ea8de15,8e98706..9d87fdf
--- 1/app/views/wikis/show.html.haml
--- 2/app/views/wikis/show.html.haml
+++ b/app/views/wikis/show.html.haml
@@@ -1,24 -1,16 +1,29 @@@
- - if @wiki != @most_recent_wiki
-   .alert
 += render 'wikis/nav'
+ %h3.page_title
+   = @wiki.title.titleize
+   = render partial: 'main_links'
+ %br
+ - if @wiki.historical?
+   .warning_message
      This is an old version of this page.
      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)}.
  
  .file_holder
 +  .file_title
 +    = @wiki.title
 +    %span.options
 +      = link_to pages_project_wikis_path(@project), class: "btn btn-tiny grouped" do
 +        Pages
 +      - if can? current_user, :write_wiki, @project
 +        = link_to history_project_wiki_path(@project, @wiki), class: "btn btn-tiny grouped" do
 +          History
 +        = link_to edit_project_wiki_path(@project, @wiki), class: "btn btn-tiny grouped" do
 +          %i.icon-edit
 +          Edit
 +
    .file_content.wiki
      = preserve do
-       = markdown @wiki.content
+       = render_wiki_content(@wiki)
  
- %p.time Last edited by #{link_to_member @project, @wiki.user}, #{time_ago_in_words @wiki.created_at} ago
+ - commit = CommitDecorator.new(@wiki.version)
+ %p.time Last edited by #{commit.author_link(avatar: true, size: 16)} #{time_ago_in_words @wiki.created_at} ago

diff --cc config/routes.rb
Simple merge

diff --cc features/steps/shared/paths.rb
Simple merge

diff --cc features/support/env.rb
Simple merge

diff --cc lib/api/internal.rb
Simple merge

diff --cc spec/features/gitlab_flavored_markdown_spec.rb
index 1da1827,05cef19..a648532
--- 1/spec/features/gitlab_flavored_markdown_spec.rb
--- 2/spec/features/gitlab_flavored_markdown_spec.rb
+++ b/spec/features/gitlab_flavored_markdown_spec.rb
@@@ -207,25 -207,5 +207,4 @@@ describe "Gitlab Flavored Markdown" d
        page.should have_link("##{issue.id}")
      end
    end
- 
- 
-   describe "for wikis" do
-     before do
-       visit project_wiki_path(project, :index)
-       fill_in "Title", with: "Circumvent ##{issue.id}"
-       fill_in "Content", with: "# Other pages\n\n* [Foo](foo)\n* [Bar](bar)\n\nAlso look at ##{issue.id} :-)"
-       click_on "Save"
-     end
- 
-     it "should NOT render title in wikis#show" do
-       within(".content .file_title") do # page title
-         page.should have_content("Circumvent ##{issue.id}")
-         page.should_not have_link("##{issue.id}")
-       end
-     end
--
-     it "should render content in wikis#show" do
-       page.should have_link("##{issue.id}")
-     end
-   end
  end