diff options
| author | Harry Kiselev <harry.kiselev@gmail.com> | 2018-12-13 13:27:20 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-12-13 13:27:20 +0000 |
| commit | 1ead46323fb83973dd7957a86bc826d30061c50f (patch) | |
| tree | c00742e036dd633838845b55ce4863163b9c1782 | |
| parent | c7ac2c715abf45846748b056239d2e6586ce29f7 (diff) | |
| download | gitlab-ce-1ead46323fb83973dd7957a86bc826d30061c50f.tar.gz | |
Fix calendar events fetching error on private profile page.
| -rw-r--r-- | app/assets/javascripts/pages/users/user_tabs.js | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-calendar-events-fetching-error.yml | 5 |
2 files changed, 7 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) diff --git a/changelogs/unreleased/fix-calendar-events-fetching-error.yml b/changelogs/unreleased/fix-calendar-events-fetching-error.yml new file mode 100644 index 00000000000..ad4a40cd9a0 --- /dev/null +++ b/changelogs/unreleased/fix-calendar-events-fetching-error.yml @@ -0,0 +1,5 @@ +--- +title: Fix calendar events fetching error on private profile page +merge_request: 23718 +author: Harry Kiselev +type: other |