diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-24 13:00:33 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-24 13:00:33 +0000 |
commit | 6d13bc5863ca4ac6c06ba544e3d13e722984a65e (patch) | |
tree | 56f988dbb19a917e345cc51a55a93cd7ce1d543a /app/controllers | |
parent | 7eaef13093fcd2d6794b056519c461499f690ea8 (diff) | |
parent | 6774a0378d624fafbd287ce4adcee3787106f1b9 (diff) | |
download | gitlab-ce-6d13bc5863ca4ac6c06ba544e3d13e722984a65e.tar.gz |
Merge branch '33097-issue-tracker' into 'master'
Associate Issues tab only with internal issues tracker
Closes #33097
See merge request !12130
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects/issues_controller.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 0ac9da2ff0f..e2ccabb22db 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -8,7 +8,6 @@ class Projects::IssuesController < Projects::ApplicationController prepend_before_action :authenticate_user!, only: [:new] - before_action :redirect_to_external_issue_tracker, only: [:index, :new] before_action :check_issues_available! before_action :issue, except: [:index, :new, :create, :bulk_update] @@ -243,19 +242,19 @@ class Projects::IssuesController < Projects::ApplicationController end def authorize_update_issue! - return render_404 unless can?(current_user, :update_issue, @issue) + render_404 unless can?(current_user, :update_issue, @issue) end def authorize_admin_issues! - return render_404 unless can?(current_user, :admin_issue, @project) + render_404 unless can?(current_user, :admin_issue, @project) end def authorize_create_merge_request! - return render_404 unless can?(current_user, :push_code, @project) && @issue.can_be_worked_on?(current_user) + 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) && @project.default_issues_tracker? + return render_404 unless @project.feature_available?(:issues, current_user) end def redirect_to_external_issue_tracker |