Add latest changes from gitlab-org/gitlab@master

1 files changed, 172 insertions, 19 deletions

diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb
index d531d256721..b187fdb2723 100644
--- a/app/controllers/projects/wikis_controller.rb
+++ b/app/controllers/projects/wikis_controller.rb
@@ -1,28 +1,120 @@
 # frozen_string_literal: true
 
 class Projects::WikisController < Projects::ApplicationController
-  include ProjectWikiActions
-  include WikiHelper
+  include PreviewMarkdown
+  include SendsBlob
+  include Gitlab::Utils::StrongMemoize
 
-  def self.local_prefixes
-    [controller_path, 'shared/wiki']
+  before_action :authorize_read_wiki!
+  before_action :authorize_create_wiki!, only: [:edit, :create]
+  before_action :authorize_admin_wiki!, only: :destroy
+  before_action :load_project_wiki
+  before_action :load_page, only: [:show, :edit, :update, :history, :destroy]
+  before_action :valid_encoding?,
+    if: -> { %w[show edit update].include?(action_name) && load_page }
+  before_action only: [:edit, :update], unless: :valid_encoding? do
+    redirect_to(project_wiki_path(@project, @page))
+  end
+
+  def new
+    redirect_to project_wiki_path(@project, SecureRandom.uuid, random_title: true)
   end
 
   def pages
-    @nesting = show_children_param
-    @show_children = @nesting != ProjectWiki::NESTING_CLOSED
     @wiki_pages = Kaminari.paginate_array(
-      project_wiki.list_pages(**sort_params)
+      @project_wiki.list_pages(sort: params[:sort], direction: params[:direction])
     ).page(params[:page])
 
-    @wiki_entries = case @nesting
-                    when ProjectWiki::NESTING_FLAT
-                      @wiki_pages
-                    else
-                      WikiDirectory.group_by_directory(@wiki_pages)
-                    end
+    @wiki_entries = WikiPage.group_by_directory(@wiki_pages)
+  end
+
+  # `#show` handles a number of scenarios:
+  #
+  # - If `id` matches a WikiPage, then show the wiki page.
+  # - If `id` is a file in the wiki repository, then send the file.
+  # - If we know the user wants to create a new page with the given `id`,
+  #   then display a create form.
+  # - Otherwise show the empty wiki page and invite the user to create a page.
+  def show
+    if @page
+      set_encoding_error unless valid_encoding?
+
+      render 'show'
+    elsif file_blob
+      send_blob(@project_wiki.repository, file_blob)
+    elsif show_create_form?
+      # Assign a title to the WikiPage unless `id` is a randomly generated slug from #new
+      title = params[:id] unless params[:random_title].present?
+
+      @page = build_page(title: title)
+
+      render 'edit'
+    else
+      render 'empty'
+    end
+  end
+
+  def edit
+  end
+
+  def update
+    return render('empty') unless can?(current_user, :create_wiki, @project)
+
+    @page = WikiPages::UpdateService.new(@project, current_user, wiki_params).execute(@page)
+
+    if @page.valid?
+      redirect_to(
+        project_wiki_path(@project, @page),
+        notice: _('Wiki was successfully updated.')
+      )
+    else
+      render 'edit'
+    end
+  rescue WikiPage::PageChangedError, WikiPage::PageRenameError, Gitlab::Git::Wiki::OperationError => e
+    @error = e
+    render 'edit'
+  end
+
+  def create
+    @page = WikiPages::CreateService.new(@project, current_user, wiki_params).execute
+
+    if @page.persisted?
+      redirect_to(
+        project_wiki_path(@project, @page),
+        notice: _('Wiki was successfully updated.')
+      )
+    else
+      render action: "edit"
+    end
+  rescue Gitlab::Git::Wiki::OperationError => e
+    @page = build_page(wiki_params)
+    @error = e
+
+    render 'edit'
+  end
+
+  def history
+    if @page
+      @page_versions = Kaminari.paginate_array(@page.versions(page: params[:page].to_i),
+                                               total_count: @page.count_versions)
+        .page(params[:page])
+    else
+      redirect_to(
+        project_wiki_path(@project, :home),
+        notice: _("Page not found")
+      )
+    end
+  end
+
+  def destroy
+    WikiPages::DestroyService.new(@project, current_user).execute(@page)
 
-    render 'show'
+    redirect_to project_wiki_path(@project, :home),
+                status: 302,
+                notice: _("Page was successfully deleted")
+  rescue Gitlab::Git::Wiki::OperationError => e
+    @error = e
+    render 'edit'
   end
 
   def git_access
@@ -30,13 +122,74 @@ class Projects::WikisController < Projects::ApplicationController
 
   private
 
-  def sort_params
-    process_params(sort_params_config)
+  def show_create_form?
+    can?(current_user, :create_wiki, @project) &&
+      @page.nil? &&
+      # Always show the create form when the wiki has had at least one page created.
+      # Otherwise, we only show the form when the user has navigated from
+      # the 'empty wiki' page
+      (@project_wiki.exists? || params[:view] == 'create')
   end
 
-  def show_children_param
-    config = nesting_params_config(params[:sort])
+  def load_project_wiki
+    @project_wiki = load_wiki
+
+    # Call #wiki to make sure the Wiki Repo is initialized
+    @project_wiki.wiki
+
+    @sidebar_page = @project_wiki.find_sidebar(params[:version_id])
+
+    unless @sidebar_page # Fallback to default sidebar
+      @sidebar_wiki_entries = WikiPage.group_by_directory(@project_wiki.list_pages(limit: 15))
+    end
+  rescue ProjectWiki::CouldNotCreateWikiError
+    flash[:notice] = _("Could not create Wiki Repository at this time. Please try again later.")
+    redirect_to project_path(@project)
+    false
+  end
+
+  def load_wiki
+    ProjectWiki.new(@project, current_user)
+  end
+
+  def wiki_params
+    params.require(:wiki).permit(:title, :content, :format, :message, :last_commit_sha)
+  end
+
+  def build_page(args = {})
+    WikiPage.new(@project_wiki).tap do |page|
+      page.update_attributes(args) # rubocop:disable Rails/ActiveRecordAliases
+    end
+  end
+
+  def load_page
+    @page ||= @project_wiki.find_page(*page_params)
+  end
+
+  def page_params
+    keys = [:id]
+    keys << :version_id if params[:action] == 'show'
+
+    params.values_at(*keys)
+  end
+
+  def valid_encoding?
+    strong_memoize(:valid_encoding) do
+      @page.content.encoding == Encoding::UTF_8
+    end
+  end
+
+  def set_encoding_error
+    flash.now[:notice] = _("The content of this page is not encoded in UTF-8. Edits can only be made via the Git repository.")
+  end
+
+  def file_blob
+    strong_memoize(:file_blob) do
+      commit = @project_wiki.repository.commit(@project_wiki.default_branch)
+
+      next unless commit
 
-    process_params(config)
+      @project_wiki.repository.blob_at(commit.id, params[:id])
+    end
   end
 end