Commit 8b13f236 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'unify-some-projects-controllers' into 'master'

Unify some projects controllers

See merge request gitlab-org/gitlab-ce!20157
parents c91957c6 74b5c4da
...@@ -160,7 +160,7 @@ class Projects::JobsController < Projects::ApplicationController ...@@ -160,7 +160,7 @@ class Projects::JobsController < Projects::ApplicationController
def build def build
@build ||= project.builds.find(params[:id]) @build ||= project.builds.find(params[:id])
.present(current_user: current_user) .present(current_user: current_user)
end end
def build_path(build) def build_path(build)
......
...@@ -95,6 +95,7 @@ class Projects::WikisController < Projects::ApplicationController ...@@ -95,6 +95,7 @@ class Projects::WikisController < Projects::ApplicationController
def destroy def destroy
@page = @project_wiki.find_page(params[:id]) @page = @project_wiki.find_page(params[:id])
WikiPages::DestroyService.new(@project, current_user).execute(@page) WikiPages::DestroyService.new(@project, current_user).execute(@page)
redirect_to project_wiki_path(@project, :home), redirect_to project_wiki_path(@project, :home),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment