summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-06-17 16:12:28 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-06-17 16:59:51 -0400
commitbc027c51836dd601025c0a48974ef921229821b8 (patch)
tree75a60ae4852e0b44ef5a5d36281ede9e7f587fc0 /app/views
parentce20400628ca6583f132d3f370ed25dacaed0b17 (diff)
downloadgitlab-ce-bc027c51836dd601025c0a48974ef921229821b8.tar.gz
Load the Merge Request > Commits tab lazily
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/merge_requests/_show.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index 5d7e73f2b28..9dc4a47258e 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -56,7 +56,8 @@
#notes.notes.tab-pane.voting_notes
= render "projects/merge_requests/discussion"
#commits.commits.tab-pane
- = render "projects/merge_requests/show/commits"
+ - if current_page?(action: 'commits')
+ = render "projects/merge_requests/show/commits"
#diffs.diffs.tab-pane
- if current_page?(action: 'diffs')
= render "projects/merge_requests/show/diffs"
@@ -64,7 +65,6 @@
.mr-loading-status
= spinner
-
:javascript
var merge_request;