diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 12:08:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 12:08:49 +0300 |
| commit | 456a7247f9e88fc2518b69a1a00e905c6db6d775 (patch) | |
| tree | 6235f3838cbf078d46de056442d9562ee4abbd74 /app/assets | |
| parent | ddd268b03b6f35c68e5a89606dbfd516f72846fd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/pages/users/user_tabs.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/pages/users/user_tabs.js b/app/assets/javascripts/pages/users/user_tabs.js index 4ac4efec45d..885150eef9d 100644 --- a/app/assets/javascripts/pages/users/user_tabs.js +++ b/app/assets/javascripts/pages/users/user_tabs.js @@ -1,4 +1,5 @@ import $ from 'jquery'; +import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; import axios from '~/lib/utils/axios_utils'; import Activities from '~/activities'; import { localTimeAgo } from '~/lib/utils/datetime_utility'; @@ -209,7 +210,7 @@ export default class UserTabs { loadActivityCalendar() { const $calendarWrap = this.$parentEl.find('.tab-pane.active .user-calendar'); - if (!$calendarWrap.length) return; + if (!$calendarWrap.length || bp.getBreakpointSize() === 'xs') return; const calendarPath = $calendarWrap.data('calendarPath'); |