diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-06-17 16:12:28 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-06-17 16:59:51 -0400 |
| commit | bc027c51836dd601025c0a48974ef921229821b8 (patch) | |
| tree | 75a60ae4852e0b44ef5a5d36281ede9e7f587fc0 /app/controllers/projects/merge_requests_controller.rb | |
| parent | ce20400628ca6583f132d3f370ed25dacaed0b17 (diff) | |
| download | gitlab-ce-bc027c51836dd601025c0a48974ef921229821b8.tar.gz | |
Load the Merge Request > Commits tab lazily
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 14069bafe71..51ecbfd561a 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -71,7 +71,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController end def commits - render 'show' + respond_to do |format| + format.html { render 'show' } + format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_commits') } } + end end def new |