From 456a7247f9e88fc2518b69a1a00e905c6db6d775 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 7 Feb 2020 09:08:49 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/assets/javascripts/pages/users/user_tabs.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/assets')

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');
 
-- 
cgit v1.2.3