diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-07-19 01:05:41 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-07-19 01:05:41 +0300 |
| commit | 339baf8f5d7716baa1a6924c94f1896cf8f6805f (patch) | |
| tree | 37845f7055e3d2f5a76445182f66237f33f1276d /app/views/users | |
| parent | 651bf36cc5d485a7c136f93b21b97bc807dd2188 (diff) | |
refactor async calendar data
Diffstat (limited to 'app/views/users')
| -rw-r--r-- | app/views/users/calendar.html.haml | 9 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/app/views/users/calendar.html.haml b/app/views/users/calendar.html.haml deleted file mode 100644 index 57b8845c55d..00000000000 --- a/app/views/users/calendar.html.haml +++ /dev/null @@ -1,9 +0,0 @@ -.clearfix.calendar - .js-contrib-calendar - .calendar-hint - Summary of issues, merge requests, push events, and comments -:javascript - new Calendar( - #{@activity_dates.to_json}, - '#{user_calendar_activities_path}' - ); diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index f246bd7a586..863fec842f5 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -105,7 +105,7 @@ .tab-content #activity.tab-pane .row-content-block.calender-block.white.second-block.hidden-xs - .user-calendar{ data: { href: user_calendar_path } } + .user-calendar{ data: { calendar_path: user_calendar_path(@user, :json), calendar_activities_path: user_calendar_activities_path } } %h4.center.light %i.fa.fa-spinner.fa-spin .user-calendar-activities |