Merge branch 'master' into 1827-prevent-concurrent-editing-wiki

 Conflicts:
	app/controllers/projects/wikis_controller.rb
	app/views/projects/wikis/edit.html.haml
	spec/features/projects/wiki/user_updates_wiki_page_spec.rb

11 files changed, 164 insertions, 166 deletions

diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml
index 9313f9e9c96..5c335ba306b 100644
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
@@ -1,3 +1,5 @@
+- commit_message = @page.persisted? ? "Update #{@page.title}" : "Create #{@page.title}"
+
 = form_for [@project.namespace.becomes(Namespace), @project, @page], method: @page.persisted? ? :put : :post, html: { class: 'form-horizontal wiki-form common-note-form prepend-top-default js-quick-submit' } do |f|
   = form_errors(@page)
 
@@ -5,16 +7,16 @@
   - if @page.persisted?
     = f.hidden_field :last_commit_sha, value: @page.commit.sha
   .form-group
-    = f.label :format, class: 'control-label'
-    .col-sm-10
+    .col-sm-12= f.label :format, class: 'control-label-full-width'
+    .col-sm-12
       = f.select :format, options_for_select(ProjectWiki::MARKUPS, {selected: @page.format}), {}, class: "form-control"
 
   .form-group
-    = f.label :content, class: 'control-label'
-    .col-sm-10
-      = render layout: 'projects/md_preview', locals: { preview_class: "md-preview" } do
+    .col-sm-12= f.label :content, class: 'control-label-full-width'
+    .col-sm-12
+      = render layout: 'projects/md_preview', locals: { url: project_wiki_preview_markdown_path(@project, @page.slug) } do
         = render 'projects/zen', f: f, attr: :content, classes: 'note-textarea', placeholder: 'Write your content or drag files here...'
-        = render 'projects/notes/hints'
+        = render 'shared/notes/hints'
 
       .clearfix
       .error-alert
@@ -29,15 +31,15 @@
           = link_to 'documentation', help_page_path("user/markdown", anchor: "wiki-specific-markdown")
 
   .form-group
-    = f.label :commit_message, class: 'control-label'
-    .col-sm-10= f.text_field :message, class: 'form-control', rows: 18
+    .col-sm-12= f.label :commit_message, class: 'control-label-full-width'
+    .col-sm-12= f.text_field :message, class: 'form-control', rows: 18, value: commit_message
 
   .form-actions
     - if @page && @page.persisted?
       = f.submit 'Save changes', class: "btn-save btn"
       .pull-right
-        = link_to "Cancel", namespace_project_wiki_path(@project.namespace, @project, @page), class: "btn btn-cancel btn-grouped"
+        = link_to "Cancel", project_wiki_path(@project, @page), class: "btn btn-cancel btn-grouped"
     - else
       = f.submit 'Create page', class: "btn-create btn"
       .pull-right
-        = link_to "Cancel", namespace_project_wiki_path(@project.namespace, @project, :home), class: "btn btn-cancel"
+        = link_to "Cancel", project_wiki_path(@project, :home), class: "btn btn-cancel"
diff --git a/app/views/projects/wikis/_main_links.html.haml b/app/views/projects/wikis/_main_links.html.haml
index 763c2fea39b..3bbd8042c3a 100644
--- a/app/views/projects/wikis/_main_links.html.haml
+++ b/app/views/projects/wikis/_main_links.html.haml
@@ -1,9 +1,9 @@
 - if (@page && @page.persisted?)
   - if can?(current_user, :create_wiki, @project)
     = link_to '#modal-new-wiki', class: "add-new-wiki btn btn-new", "data-toggle" => "modal" do
-      New Page
-  = link_to namespace_project_wiki_history_path(@project.namespace, @project, @page), class: "btn" do
-    Page History
-  - if can?(current_user, :create_wiki, @project)
-    = link_to namespace_project_wiki_edit_path(@project.namespace, @project, @page), class: "btn" do
+      New page
+  = link_to project_wiki_history_path(@project, @page), class: "btn" do
+    Page history
+  - if can?(current_user, :create_wiki, @project) && @page.latest?
+    = link_to project_wiki_edit_path(@project, @page), class: "btn js-wiki-edit" do
       Edit
diff --git a/app/views/projects/wikis/_new.html.haml b/app/views/projects/wikis/_new.html.haml
index 3d33679f07d..13dd8461433 100644
--- a/app/views/projects/wikis/_new.html.haml
+++ b/app/views/projects/wikis/_new.html.haml
@@ -1,21 +1,18 @@
-- @no_container = true
-
-%div{ class: container_class }
-  #modal-new-wiki.modal
-    .modal-dialog
-      .modal-content
-        .modal-header
-          %a.close{ href: "#", "data-dismiss" => "modal" } ×
-          %h3.page-title New Wiki Page
-        .modal-body
-          %form.new-wiki-page
-            .form-group
-              = label_tag :new_wiki_path do
-                %span Page slug
-              = text_field_tag :new_wiki_path, nil, placeholder: 'how-to-setup', class: 'form-control', required: true, :'data-wikis-path' => namespace_project_wikis_path(@project.namespace, @project), autofocus: true
-              %span.new-wiki-page-slug-tip
-                = icon('lightbulb-o')
-                Tip: You can specify the full path for the new file.
-                We will automatically create any missing directories.
-            .form-actions
-              = button_tag 'Create Page', class: 'build-new-wiki btn btn-create'
+#modal-new-wiki.modal
+  .modal-dialog
+    .modal-content
+      .modal-header
+        %a.close{ href: "#", "data-dismiss" => "modal" } ×
+        %h3.page-title New Wiki Page
+      .modal-body
+        %form.new-wiki-page
+          .form-group
+            = label_tag :new_wiki_path do
+              %span Page slug
+            = text_field_tag :new_wiki_path, nil, placeholder: 'how-to-setup', class: 'form-control', required: true, :'data-wikis-path' => project_wikis_path(@project), autofocus: true
+            %span.new-wiki-page-slug-tip
+              = icon('lightbulb-o')
+              Tip: You can specify the full path for the new file.
+              We will automatically create any missing directories.
+          .form-actions
+            = button_tag 'Create page', class: 'build-new-wiki btn btn-create'
diff --git a/app/views/projects/wikis/_pages_wiki_page.html.haml b/app/views/projects/wikis/_pages_wiki_page.html.haml
index 6298cf6c8da..7c2f562d422 100644
--- a/app/views/projects/wikis/_pages_wiki_page.html.haml
+++ b/app/views/projects/wikis/_pages_wiki_page.html.haml
@@ -1,5 +1,5 @@
 %li
-  = link_to wiki_page.title, namespace_project_wiki_path(@project.namespace, @project, wiki_page)
+  = link_to wiki_page.title, project_wiki_path(@project, wiki_page)
   %small (#{wiki_page.format})
   .pull-right
     %small Last edited #{time_ago_with_tooltip(wiki_page.commit.authored_date)}
diff --git a/app/views/projects/wikis/_sidebar.html.haml b/app/views/projects/wikis/_sidebar.html.haml
index 8c582f747b3..62873d3aa66 100644
--- a/app/views/projects/wikis/_sidebar.html.haml
+++ b/app/views/projects/wikis/_sidebar.html.haml
@@ -1,9 +1,9 @@
-%aside.right-sidebar.right-sidebar-expanded.wiki-sidebar.js-wiki-sidebar.js-right-sidebar{ data: { "offset-top" => "101", "spy" => "affix" } }
+%aside.right-sidebar.right-sidebar-expanded.wiki-sidebar.js-wiki-sidebar.js-right-sidebar{ data: { "offset-top" => "50", "spy" => "affix" } }
   .block.wiki-sidebar-header.append-bottom-default
     %a.gutter-toggle.pull-right.visible-xs-block.visible-sm-block.js-sidebar-wiki-toggle{ href: "#" }
       = icon('angle-double-right')
 
-    - git_access_url = namespace_project_wikis_git_access_path(@project.namespace, @project)
+    - git_access_url = project_wikis_git_access_path(@project)
     = link_to git_access_url, class: active_nav_link?(path: 'wikis#git_access') ? 'active' : '' do
       = succeed ' ' do
         = icon('cloud-download')
@@ -15,7 +15,10 @@
         = render @sidebar_wiki_entries, context: 'sidebar'
 
     .block
-      = link_to namespace_project_wikis_pages_path(@project.namespace, @project), class: 'btn btn-block' do
+      = link_to project_wikis_pages_path(@project), class: 'btn btn-block' do
         More Pages
 
 = render 'projects/wikis/new'
+
+:javascript
+  new Sidebar();
diff --git a/app/views/projects/wikis/_sidebar_wiki_page.html.haml b/app/views/projects/wikis/_sidebar_wiki_page.html.haml
index 0a61d90177b..2423ac6abce 100644
--- a/app/views/projects/wikis/_sidebar_wiki_page.html.haml
+++ b/app/views/projects/wikis/_sidebar_wiki_page.html.haml
@@ -1,3 +1,3 @@
 %li{ class: active_when(params[:id] == wiki_page.slug) }
-  = link_to namespace_project_wiki_path(@project.namespace, @project, wiki_page) do
+  = link_to project_wiki_path(@project, wiki_page) do
     = wiki_page.title.capitalize
diff --git a/app/views/projects/wikis/edit.html.haml b/app/views/projects/wikis/edit.html.haml
index 2ec03a00db9..e2d835d8af0 100644
--- a/app/views/projects/wikis/edit.html.haml
+++ b/app/views/projects/wikis/edit.html.haml
@@ -1,41 +1,40 @@
-- @no_container = true
+- @content_class = "limit-container-width limit-container-width-sm" unless fluid_layout
 - page_title "Edit", @page.title.capitalize, "Wiki"
 
-%div{ class: container_class }
-  - if @conflict
-    .alert.alert-danger
-      Someone edited the page the same time you did. Please check out
-      = link_to "the page", namespace_project_wiki_path(@project.namespace, @project, @page), target: "_blank"
-      and make sure your changes will not unintentionally remove theirs.
+- if @conflict
+  .alert.alert-danger
+    Someone edited the page the same time you did. Please check out
+    = link_to "the page", namespace_project_wiki_path(@project.namespace, @project, @page), target: "_blank"
+    and make sure your changes will not unintentionally remove theirs.
 
-  .wiki-page-header.has-sidebar-toggle
-    %button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
-      = icon('angle-double-left')
+.wiki-page-header.has-sidebar-toggle
+  %button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
+    = icon('angle-double-left')
 
-    .nav-text
-      %h2.wiki-page-title
+  .nav-text
+    %h2.wiki-page-title
+      - if @page.persisted?
+        = link_to @page.title.capitalize, project_wiki_path(@project, @page)
+      - else
+        = @page.title.capitalize
+      %span.light
+        ·
         - if @page.persisted?
-          = link_to @page.title.capitalize, namespace_project_wiki_path(@project.namespace, @project, @page)
+          Edit Page
         - else
-          = @page.title.capitalize
-        %span.light
-          ·
-          - if @page.persisted?
-            Edit Page
-          - else
-            Create Page
+          Create Page
 
-    .nav-controls
-      - if can?(current_user, :create_wiki, @project)
-        = link_to '#modal-new-wiki', class: "add-new-wiki btn btn-new", "data-toggle" => "modal" do
-          New Page
-      - if @page.persisted?
-        = link_to namespace_project_wiki_history_path(@project.namespace, @project, @page), class: "btn" do
-          Page History
-        - if can?(current_user, :admin_wiki, @project)
-          = link_to namespace_project_wiki_path(@project.namespace, @project, @page), data: { confirm: "Are you sure you want to delete this page?"}, method: :delete, class: "btn btn-danger" do
-            Delete
+  .nav-controls
+    - if can?(current_user, :create_wiki, @project)
+      = link_to '#modal-new-wiki', class: "add-new-wiki btn btn-new", "data-toggle" => "modal" do
+        New page
+    - if @page.persisted?
+      = link_to project_wiki_history_path(@project, @page), class: "btn" do
+        Page history
+      - if can?(current_user, :admin_wiki, @project)
+        = link_to project_wiki_path(@project, @page), data: { confirm: "Are you sure you want to delete this page?"}, method: :delete, class: "btn btn-danger" do
+          Delete
 
-  = render 'form'
+= render 'form'
 
 = render 'sidebar'
diff --git a/app/views/projects/wikis/git_access.html.haml b/app/views/projects/wikis/git_access.html.haml
index fb0efd85dcd..e64dd6085fe 100644
--- a/app/views/projects/wikis/git_access.html.haml
+++ b/app/views/projects/wikis/git_access.html.haml
@@ -1,43 +1,42 @@
-- @no_container = true
+- @content_class = "limit-container-width limit-container-width-sm" unless fluid_layout
 - page_title "Git Access", "Wiki"
 
-%div{ class: container_class }
-  .wiki-page-header.has-sidebar-toggle
-    %button.btn.btn-default.visible-xs.visible-sm.pull-right.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
-      = icon('angle-double-left')
+.wiki-page-header.has-sidebar-toggle
+  %button.btn.btn-default.visible-xs.visible-sm.pull-right.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
+    = icon('angle-double-left')
 
-    .git-access-header
-      Clone repository
-      %strong= @project_wiki.path_with_namespace
+  .git-access-header
+    Clone repository
+    %strong= @project_wiki.path_with_namespace
 
-    = render "shared/clone_panel", project: @project_wiki
+  = render "shared/clone_panel", project: @project_wiki
 
-  .wiki-git-access
-    %h3 Install Gollum
-    %pre.dark
-      :preserve
-        gem install gollum
-    %p
-      It is recommended to install
-      %code github-markdown
-      so that GFM features render locally:
-    %pre.dark
-      :preserve
-        gem install github-markdown
+.wiki-git-access
+  %h3 Install Gollum
+  %pre.dark
+    :preserve
+      gem install gollum
+  %p
+    It is recommended to install
+    %code github-markdown
+    so that GFM features render locally:
+  %pre.dark
+    :preserve
+      gem install github-markdown
 
-    %h3 Clone your wiki
-    %pre.dark
-      :preserve
-        git clone #{ content_tag(:span, default_url_to_repo(@project_wiki), class: 'clone')}
-        cd #{h @project_wiki.path}
+  %h3 Clone your wiki
+  %pre.dark
+    :preserve
+      git clone #{ content_tag(:span, h(default_url_to_repo(@project_wiki)), class: 'clone')}
+      cd #{h @project_wiki.path}
 
-    %h3 Start Gollum and edit locally
-    %pre.dark
-      :preserve
-        gollum
-        == Sinatra/1.3.5 has taken the stage on 4567 for development with backup from Thin
-        >> Thin web server (v1.5.0 codename Knife)
-        >> Maximum connections set to 1024
-        >> Listening on 0.0.0.0:4567, CTRL+C to stop
+  %h3 Start Gollum and edit locally
+  %pre.dark
+    :preserve
+      gollum
+      == Sinatra/1.3.5 has taken the stage on 4567 for development with backup from Thin
+      >> Thin web server (v1.5.0 codename Knife)
+      >> Maximum connections set to 1024
+      >> Listening on 0.0.0.0:4567, CTRL+C to stop
 
 = render 'sidebar'
diff --git a/app/views/projects/wikis/history.html.haml b/app/views/projects/wikis/history.html.haml
index dd7213622c1..306feeff259 100644
--- a/app/views/projects/wikis/history.html.haml
+++ b/app/views/projects/wikis/history.html.haml
@@ -1,42 +1,41 @@
 - page_title "History", @page.title.capitalize, "Wiki"
 
-%div{ class: container_class }
-  .wiki-page-header.has-sidebar-toggle
-    %button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
-      = icon('angle-double-left')
+.wiki-page-header.has-sidebar-toggle
+  %button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
+    = icon('angle-double-left')
 
-    .nav-text
-      %h2.wiki-page-title
-        = link_to @page.title.capitalize, namespace_project_wiki_path(@project.namespace, @project, @page)
-        %span.light
-          ·
-          History
+  .nav-text
+    %h2.wiki-page-title
+      = link_to @page.title.capitalize, project_wiki_path(@project, @page)
+      %span.light
+        ·
+        History
 
-  .table-holder
-    %table.table
-      %thead
+.table-holder
+  %table.table
+    %thead
+      %tr
+        %th Page version
+        %th Author
+        %th Commit Message
+        %th Last updated
+        %th Format
+    %tbody
+      - @page.versions.each_with_index do |version, index|
+        - commit = version
         %tr
-          %th Page version
-          %th Author
-          %th Commit Message
-          %th Last updated
-          %th Format
-      %tbody
-        - @page.versions.each_with_index do |version, index|
-          - commit = version
-          %tr
-            %td
-              = link_to project_wiki_path_with_version(@project, @page,
-                                                       commit.id, index == 0) do
-                = truncate_sha(commit.id)
-            %td
-              = commit.author.name
-            %td
-              = commit.message
-            %td
-              #{time_ago_with_tooltip(version.authored_date)}
-            %td
-              %strong
-                = @page.page.wiki.page(@page.page.name, commit.id).try(:format)
+          %td
+            = link_to project_wiki_path_with_version(@project, @page,
+                                                     commit.id, index == 0) do
+              = truncate_sha(commit.id)
+          %td
+            = commit.author.name
+          %td
+            = commit.message
+          %td
+            #{time_ago_with_tooltip(version.authored_date)}
+          %td
+            %strong
+              = @page.page.wiki.page(@page.page.name, commit.id).try(:format)
 
 = render 'sidebar'
diff --git a/app/views/projects/wikis/pages.html.haml b/app/views/projects/wikis/pages.html.haml
index 5fba2b1a5ae..dece1fad0bb 100644
--- a/app/views/projects/wikis/pages.html.haml
+++ b/app/views/projects/wikis/pages.html.haml
@@ -9,7 +9,7 @@
         Wiki Pages
 
     .nav-controls
-      = link_to namespace_project_wikis_git_access_path(@project.namespace, @project), class: 'btn' do
+      = link_to project_wikis_git_access_path(@project), class: 'btn' do
         = icon('cloud-download')
         Clone repository
 
diff --git a/app/views/projects/wikis/show.html.haml b/app/views/projects/wikis/show.html.haml
index 3609461b721..9dadd685ea2 100644
--- a/app/views/projects/wikis/show.html.haml
+++ b/app/views/projects/wikis/show.html.haml
@@ -1,33 +1,32 @@
-- @no_container = true
+- @content_class = "limit-container-width limit-container-width-sm" unless fluid_layout
+- breadcrumb_title "Wiki"
 - page_title @page.title.capitalize, "Wiki"
 
-%div{ class: container_class }
-  .wiki-page-header.has-sidebar-toggle
-    %button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
-      = icon('angle-double-left')
+.wiki-page-header.has-sidebar-toggle
+  %button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
+    = icon('angle-double-left')
 
-    .wiki-breadcrumb
-      %span= breadcrumb(@page.slug)
+  .wiki-breadcrumb
+    %span= breadcrumb(@page.slug)
 
-    .nav-text
-      %h2.wiki-page-title= @page.title.capitalize
-      %span.wiki-last-edit-by
-        Last edited by
-        %strong
-          #{@page.commit.author.name}
-        #{time_ago_with_tooltip(@page.commit.authored_date)}
+  .nav-text
+    %h2.wiki-page-title= @page.title.capitalize
+    %span.wiki-last-edit-by
+      Last edited by
+      %strong
+        #{@page.commit.author.name}
+      #{time_ago_with_tooltip(@page.commit.authored_date)}
 
-    .nav-controls
-      = render 'main_links'
+  .nav-controls
+    = render 'main_links'
 
-  - if @page.historical?
-    .warning_message
-      This is an old version of this page.
-      You can view the #{link_to "most recent version", namespace_project_wiki_path(@project.namespace, @project, @page)} or browse the #{link_to "history", namespace_project_wiki_history_path(@project.namespace, @project, @page)}.
+- if @page.historical?
+  .warning_message
+    This is an old version of this page.
+    You can view the #{link_to "most recent version", project_wiki_path(@project, @page)} or browse the #{link_to "history", project_wiki_history_path(@project, @page)}.
 
-  .wiki-holder.prepend-top-default.append-bottom-default
-    .wiki
-      = preserve do
-        = render_wiki_content(@page)
+.wiki-holder.prepend-top-default.append-bottom-default
+  .wiki
+    = render_wiki_content(@page)
 
 = render 'sidebar'