diff options
Diffstat (limited to 'app/controllers/projects/wikis_controller.rb')
-rw-r--r-- | app/controllers/projects/wikis_controller.rb | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb index 88dd111132b..e0b7ac2db23 100644 --- a/app/controllers/projects/wikis_controller.rb +++ b/app/controllers/projects/wikis_controller.rb @@ -21,20 +21,20 @@ class Projects::WikisController < Projects::ApplicationController end def show - view_param = @project_wiki.empty? ? params[:view] : 'create' + view_param = @project_wiki.empty? ? params[:view] : "create" if @page set_encoding_error unless valid_encoding? - render 'show' + render "show" elsif file_blob send_blob(@project_wiki.repository, file_blob) - elsif can?(current_user, :create_wiki, @project) && view_param == 'create' + elsif can?(current_user, :create_wiki, @project) && view_param == "create" @page = build_page(title: params[:id]) - render 'edit' + render "edit" else - render 'empty' + render "empty" end end @@ -42,21 +42,21 @@ class Projects::WikisController < Projects::ApplicationController end def update - return render('empty') unless can?(current_user, :create_wiki, @project) + 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.' + notice: "Wiki was successfully updated." ) else - render 'edit' + render "edit" end rescue WikiPage::PageChangedError, WikiPage::PageRenameError, Gitlab::Git::Wiki::OperationError => e @error = e - render 'edit' + render "edit" end def create @@ -65,7 +65,7 @@ class Projects::WikisController < Projects::ApplicationController if @page.persisted? redirect_to( project_wiki_path(@project, @page), - notice: 'Wiki was successfully updated.' + notice: "Wiki was successfully updated." ) else render action: "edit" @@ -74,13 +74,13 @@ class Projects::WikisController < Projects::ApplicationController @page = build_page(wiki_params) @error = e - render 'edit' + render "edit" end def history if @page @page_versions = Kaminari.paginate_array(@page.versions(page: params[:page].to_i), - total_count: @page.count_versions) + total_count: @page.count_versions) .page(params[:page]) else redirect_to( @@ -94,11 +94,11 @@ class Projects::WikisController < Projects::ApplicationController WikiPages::DestroyService.new(@project, current_user).execute(@page) redirect_to project_wiki_path(@project, :home), - status: 302, - notice: "Page was successfully deleted" + status: 302, + notice: "Page was successfully deleted" rescue Gitlab::Git::Wiki::OperationError => e @error = e - render 'edit' + render "edit" end def git_access @@ -143,7 +143,7 @@ class Projects::WikisController < Projects::ApplicationController def page_params keys = [:id] - keys << :version_id if params[:action] == 'show' + keys << :version_id if params[:action] == "show" params.values_at(*keys) end |