Bring changes from EE

2018-06-26 01:33:12 +08:00 · 2018-06-26 01:33:12 +08:00 · 74b5c4daf9
parent dd949b0be4
commit 74b5c4daf9
2 changed files with 2 additions and 1 deletions
--- a/app/controllers/projects/jobs_controller.rb
+++ b/app/controllers/projects/jobs_controller.rb
@ -160,7 +160,7 @@ class Projects::JobsController < Projects::ApplicationController

  def build
    @build ||= project.builds.find(params[:id])
-                 .present(current_user: current_user)
+      .present(current_user: current_user)
  end

  def build_path(build)
--- a/app/controllers/projects/wikis_controller.rb
+++ b/app/controllers/projects/wikis_controller.rb
@ -95,6 +95,7 @@ class Projects::WikisController < Projects::ApplicationController

  def destroy
    @page = @project_wiki.find_page(params[:id])
+
    WikiPages::DestroyService.new(@project, current_user).execute(@page)

    redirect_to project_wiki_path(@project, :home),