summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-02-29 19:10:11 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2016-02-29 19:10:11 -0500
commitc6b27550c82c8c123047cae5c85bf3271a531d6a (patch)
treefc3152483e7f56044daebafa5f6850325dba9210
parent4c4d7424313a2c46b62d611c6d5f55ae91a7c7c6 (diff)
downloadgitlab-ce-c6b27550c82c8c123047cae5c85bf3271a531d6a.tar.gz
Let User class handle resource loading
-rw-r--r--app/views/users/show.html.haml5
1 files changed, 1 insertions, 4 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 56ad25b00c2..b55989281e6 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -88,7 +88,7 @@
#activity.tab-pane.active
.gray-content-block.white.second-block
%div{ class: container_class }
- .user-calendar
+ .user-calendar{data: {url: user_calendar_path}}
%h4.center.light
%i.fa.fa-spinner.fa-spin
.user-calendar-activities
@@ -107,6 +107,3 @@
.loading-status
= spinner
-
-:javascript
- $(".user-calendar").load("#{user_calendar_path}");