diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2018-09-24 14:39:00 +0100 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2018-09-24 14:39:00 +0100 |
| commit | 05afd11e16aecd43adfb869ae90aa6cae13916ec (patch) | |
| tree | 63b31431981d48ac970853778dd01a5301bb9564 /app/controllers/projects/pages_controller.rb | |
| parent | 086549d986a453e1b2dd0d09ffbd19d0487d9c51 (diff) | |
| parent | 28086b203ae397e01d5e9870dfbddd66466450c2 (diff) | |
| download | gitlab-ce-05afd11e16aecd43adfb869ae90aa6cae13916ec.tar.gz | |
Merge remote-tracking branch 'origin/master' into ce-6983-promote-starting-a-gitlab-com-trial
Diffstat (limited to 'app/controllers/projects/pages_controller.rb')
| -rw-r--r-- | app/controllers/projects/pages_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects/pages_controller.rb b/app/controllers/projects/pages_controller.rb index ff49911d892..e1eba4f8327 100644 --- a/app/controllers/projects/pages_controller.rb +++ b/app/controllers/projects/pages_controller.rb @@ -5,9 +5,11 @@ class Projects::PagesController < Projects::ApplicationController before_action :authorize_read_pages!, only: [:show] before_action :authorize_update_pages!, except: [:show] + # rubocop: disable CodeReuse/ActiveRecord def show @domains = @project.pages_domains.order(:domain) end + # rubocop: enable CodeReuse/ActiveRecord def destroy project.remove_pages |