Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-09 12:08:00 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-09 12:08:00 +0300
commitaa10b541b6a3fbc7fa712abcc59d073fc8dc620a (patch)
treecde565fd177bcfd44ea892d6ebbdfcab4fb7cd35 /app/controllers/projects/pages_controller.rb
parenta5ba0dd8c6a4221f010a1fabb50aa1239314e3ef (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/pages_controller.rb')
-rw-r--r--app/controllers/projects/pages_controller.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/projects/pages_controller.rb b/app/controllers/projects/pages_controller.rb
index 722fc30b3ff..f1e591ea1ec 100644
--- a/app/controllers/projects/pages_controller.rb
+++ b/app/controllers/projects/pages_controller.rb
@@ -15,8 +15,7 @@ class Projects::PagesController < Projects::ApplicationController
# rubocop: enable CodeReuse/ActiveRecord
def destroy
- project.remove_pages
- project.pages_domains.destroy_all # rubocop: disable DestroyAll
+ ::Pages::DeleteService.new(@project, current_user).execute
respond_to do |format|
format.html do