diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-06-26 01:33:12 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-06-26 01:33:12 +0800 |
| commit | 74b5c4daf9cc4f567ccc27767556633abeadbe2c (patch) | |
| tree | 122ebff1643e6b773298846a508bb79a0b3215e2 | |
| parent | dd949b0be4b2187d01a05ea1ce32abc295077897 (diff) | |
| download | gitlab-ce-74b5c4daf9cc4f567ccc27767556633abeadbe2c.tar.gz | |
Bring changes from EE
| -rw-r--r-- | app/controllers/projects/jobs_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/wikis_controller.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb index dd12d30a085..63f0aea3195 100644 --- 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) diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb index 242e6491456..aa844e94d89 100644 --- 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), |