summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/pages/projects
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-23 12:08:18 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-23 12:08:18 +0000
commit4aeb8a02c506eaa8f0710ee17edd9e35dd68d280 (patch)
tree42a0ab818ee72a5f99d017f7ca05b6b6349e142a /app/assets/javascripts/pages/projects
parentb8bb2148c282f5ebaf5cd3c83d905285902a1446 (diff)
downloadgitlab-ce-4aeb8a02c506eaa8f0710ee17edd9e35dd68d280.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pages/projects')
-rw-r--r--app/assets/javascripts/pages/projects/wikis/wikis.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/pages/projects/wikis/wikis.js b/app/assets/javascripts/pages/projects/wikis/wikis.js
index d41199f6374..80b62859134 100644
--- a/app/assets/javascripts/pages/projects/wikis/wikis.js
+++ b/app/assets/javascripts/pages/projects/wikis/wikis.js
@@ -1,4 +1,4 @@
-import bp from '../../../breakpoints';
+import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils';
import { s__, sprintf } from '~/locale';
export default class Wikis {
@@ -52,7 +52,7 @@ export default class Wikis {
static sidebarCanCollapse() {
const bootstrapBreakpoint = bp.getBreakpointSize();
- return bootstrapBreakpoint === 'xs';
+ return bootstrapBreakpoint === 'xs' || bootstrapBreakpoint === 'sm';
}
renderSidebar() {