diff options
| author | Christiaan Van den Poel <christiaan.vandenpoel@gmail.com> | 2018-01-08 12:06:25 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-01-08 12:06:25 +0300 |
| commit | 66ebb206b09f83288ee6acbd6d11b2963ae43c9b (patch) | |
| tree | 7447b9e0647bebbe0eb5a59af0f068a35ce11e25 /app/controllers | |
| parent | 15f7f52b4034d4ede3b923e95df6884f36194245 (diff) | |
disables the shortcut to the issue boards when issues are disabled
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/application_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/projects/boards_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb index 9e79852e378..6025a40348b 100644 --- a/app/controllers/projects/application_controller.rb +++ b/app/controllers/projects/application_controller.rb @@ -86,4 +86,8 @@ class Projects::ApplicationController < ApplicationController def require_pages_enabled! not_found unless @project.pages_available? end + + def check_issues_available! + return render_404 unless @project.feature_available?(:issues, current_user) + end end diff --git a/app/controllers/projects/boards_controller.rb b/app/controllers/projects/boards_controller.rb index e36105ddc11..949e54ff819 100644 --- a/app/controllers/projects/boards_controller.rb +++ b/app/controllers/projects/boards_controller.rb @@ -2,6 +2,7 @@ class Projects::BoardsController < Projects::ApplicationController include BoardsResponses include IssuableCollections + before_action :check_issues_available! before_action :authorize_read_board!, only: [:index, :show] before_action :assign_endpoint_vars diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index d7a3441a245..384f18b316c 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -194,10 +194,6 @@ class Projects::IssuesController < Projects::ApplicationController render_404 unless can?(current_user, :push_code, @project) && @issue.can_be_worked_on?(current_user) end - def check_issues_available! - return render_404 unless @project.feature_available?(:issues, current_user) - end - def render_issue_json if @issue.valid? render json: serializer.represent(@issue) |