diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-12-13 13:27:20 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-12-13 13:27:20 +0000 |
| commit | 8ff205b5ad897b434b268e988872d2c860164424 (patch) | |
| tree | c00742e036dd633838845b55ce4863163b9c1782 /app | |
| parent | c7ac2c715abf45846748b056239d2e6586ce29f7 (diff) | |
| parent | 1ead46323fb83973dd7957a86bc826d30061c50f (diff) | |
| download | gitlab-ce-8ff205b5ad897b434b268e988872d2c860164424.tar.gz | |
Merge branch 'fix-calendar-events-fetching-error' into 'master'
Fix calendar events fetching error on private profile page.
Closes #54938
See merge request gitlab-org/gitlab-ce!23718
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/pages/users/user_tabs.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/pages/users/user_tabs.js b/app/assets/javascripts/pages/users/user_tabs.js index 006eaa08cd1..1c3fd58ca74 100644 --- a/app/assets/javascripts/pages/users/user_tabs.js +++ b/app/assets/javascripts/pages/users/user_tabs.js @@ -208,6 +208,8 @@ export default class UserTabs { loadActivityCalendar() { const $calendarWrap = this.$parentEl.find('.tab-pane.active .user-calendar'); + if (!$calendarWrap.length) return; + const calendarPath = $calendarWrap.data('calendarPath'); AjaxCache.retrieve(calendarPath) |