diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-06-25 18:21:12 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-06-25 18:21:12 +0000 |
| commit | 8b13f2366aa87b801a696e07b3e490dcf1e7de8c (patch) | |
| tree | c0d186720d76604f5e263c7a6f2450f5c92020b5 | |
| parent | c91957c6fdf6e54ab00b0230e37a66f5ae47c269 (diff) | |
| parent | 74b5c4daf9cc4f567ccc27767556633abeadbe2c (diff) | |
| download | gitlab-ce-8b13f2366aa87b801a696e07b3e490dcf1e7de8c.tar.gz | |
Merge branch 'unify-some-projects-controllers' into 'master'
Unify some projects controllers
See merge request gitlab-org/gitlab-ce!20157
| -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), |