summaryrefslogtreecommitdiff
path: root/app/controllers/projects/issues_controller.rb
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <mail@zjvandeweg.nl>2016-02-09 12:02:52 +0100
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2016-02-22 12:10:56 +0100
commitdf27b3a1742048358674733d9cb3392348d5e964 (patch)
treefd16fca8cf559793360141b21549ad3053a11178 /app/controllers/projects/issues_controller.rb
parent04d1b412587028260ac219a32bdf3b03ac022308 (diff)
downloadgitlab-ce-df27b3a1742048358674733d9cb3392348d5e964.tar.gz
Issuable can be assigned to author
Closes #9014 The only difference with #9014 is that I thoughed the author should also be able to assign the issue. If this is unwanted behavior Ill revert it.
Diffstat (limited to 'app/controllers/projects/issues_controller.rb')
-rw-r--r--app/controllers/projects/issues_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 67faa1e4437..8aa85e448c4 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -59,8 +59,8 @@ class Projects::IssuesController < Projects::ApplicationController
end
def show
- @note = @project.notes.new(noteable: @issue)
- @notes = @issue.notes.nonawards.with_associations.fresh
+ @note = @project.notes.new(noteable: @issue)
+ @notes = @issue.notes.nonawards.with_associations.fresh
@noteable = @issue
@merge_requests = @issue.referenced_merge_requests(current_user)