diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-04 09:27:52 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-04 09:27:52 +0000 |
| commit | ef71bf6278759aafb1a480916cfafb9c9650eddc (patch) | |
| tree | 6c35c1798130abc3d653af689e847d9ad83a785a /app/controllers/projects | |
| parent | 68c12e15cc236548918f91393ebef3c06c124814 (diff) | |
| parent | 3ce95e7c16712cbede82f70c3a67916088f42b7e (diff) | |
| download | gitlab-ce-ef71bf6278759aafb1a480916cfafb9c9650eddc.tar.gz | |
Merge branch '30529-remove-pages-tab-if-pages-isn-t-enabled' into 'master'
Disable navigation to Pages config if Pages is disabled
Closes #30529
See merge request !11008
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/application_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/projects/pages_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/projects/pages_domains_controller.rb | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb index e2f81b09adc..89f1128ec36 100644 --- a/app/controllers/projects/application_controller.rb +++ b/app/controllers/projects/application_controller.rb @@ -89,4 +89,8 @@ class Projects::ApplicationController < ApplicationController def builds_enabled return render_404 unless @project.feature_available?(:builds, current_user) end + + def require_pages_enabled! + not_found unless Gitlab.config.pages.enabled + end end diff --git a/app/controllers/projects/pages_controller.rb b/app/controllers/projects/pages_controller.rb index fbd18b68141..93b2c180810 100644 --- a/app/controllers/projects/pages_controller.rb +++ b/app/controllers/projects/pages_controller.rb @@ -1,6 +1,7 @@ class Projects::PagesController < Projects::ApplicationController layout 'project_settings' + before_action :require_pages_enabled! before_action :authorize_read_pages!, only: [:show] before_action :authorize_update_pages!, except: [:show] diff --git a/app/controllers/projects/pages_domains_controller.rb b/app/controllers/projects/pages_domains_controller.rb index b8c253f6ae3..3a93977fd27 100644 --- a/app/controllers/projects/pages_domains_controller.rb +++ b/app/controllers/projects/pages_domains_controller.rb @@ -1,6 +1,7 @@ class Projects::PagesDomainsController < Projects::ApplicationController layout 'project_settings' + before_action :require_pages_enabled! before_action :authorize_update_pages!, except: [:show] before_action :domain, only: [:show, :destroy] |