summaryrefslogtreecommitdiff
path: root/app/controllers/projects/issues_controller.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-07-04 17:08:41 +0000
committerDouwe Maan <douwe@gitlab.com>2017-07-04 17:08:41 +0000
commit2c78c7f4cdb1fae2650563f80feb294d2b7e5d80 (patch)
treea4c0d64344178d842c966a02ffb493480ffd49f8 /app/controllers/projects/issues_controller.rb
parentd453bb863593f7d5daab2a3e88ff1f18139d7eb1 (diff)
downloadgitlab-ce-2c78c7f4cdb1fae2650563f80feb294d2b7e5d80.tar.gz
Revert "Merge branch 'revert-12499' into 'master'"revert-2c879643
This reverts merge request !12557
Diffstat (limited to 'app/controllers/projects/issues_controller.rb')
-rw-r--r--app/controllers/projects/issues_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index ca483c105b6..54f108353cd 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -227,7 +227,7 @@ class Projects::IssuesController < Projects::ApplicationController
def issue
return @issue if defined?(@issue)
# The Sortable default scope causes performance issues when used with find_by
- @noteable = @issue ||= @project.issues.where(iid: params[:id]).reorder(nil).take!
+ @noteable = @issue ||= @project.issues.find_by!(iid: params[:id])
return render_404 unless can?(current_user, :read_issue, @issue)