diff options
author | Greg Smethells <smethells@icloud.com> | 2015-12-04 13:00:07 -0600 |
---|---|---|
committer | Greg Smethells <smethells@icloud.com> | 2015-12-11 10:14:55 -0600 |
commit | 0272f27401d25faed97419611a78a968f801a42f (patch) | |
tree | 0141c7f7fbc2565fc3689bf84f60524ca8f02481 /app/controllers/projects/issues_controller.rb | |
parent | a2a68858c88151ce0d77f602dbae59d595495ac6 (diff) | |
download | gitlab-ce-0272f27401d25faed97419611a78a968f801a42f.tar.gz |
display referenced merge requests in issue description with CI statusgsmethells/gitlab-ce-mr-statuses
Diffstat (limited to 'app/controllers/projects/issues_controller.rb')
-rw-r--r-- | app/controllers/projects/issues_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index ae474cf8d68..cf617d53ed6 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -62,6 +62,7 @@ class Projects::IssuesController < Projects::ApplicationController @note = @project.notes.new(noteable: @issue) @notes = @issue.notes.nonawards.with_associations.fresh @noteable = @issue + @merge_requests = @issue.referenced_merge_requests respond_with(@issue) end |