Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-21 00:08:00 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-21 00:08:00 +0300
commitbe59dd1d43332496def276c8d3e78fc82e94273a (patch)
tree19c25e5a7e7f88a0ac4bd797bf70ac48603656cc /app/assets/javascripts/merge_request_tabs.js
parent855bf0533bc5d5df2821e9a5951fae4f153f7492 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/merge_request_tabs.js')
-rw-r--r--app/assets/javascripts/merge_request_tabs.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js
index 52674107df2..96c4741fc2e 100644
--- a/app/assets/javascripts/merge_request_tabs.js
+++ b/app/assets/javascripts/merge_request_tabs.js
@@ -2,12 +2,12 @@
import $ from 'jquery';
import Vue from 'vue';
+import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils';
import Cookies from 'js-cookie';
import axios from './lib/utils/axios_utils';
import flash from './flash';
import BlobForkSuggestion from './blob/blob_fork_suggestion';
import initChangesDropdown from './init_changes_dropdown';
-import bp from './breakpoints';
import {
parseUrlPathname,
handleLocationHash,
@@ -194,7 +194,7 @@ export default class MergeRequestTabs {
if (!isInVueNoteablePage()) {
this.loadDiff(href);
}
- if (bp.getBreakpointSize() !== 'lg') {
+ if (bp.getBreakpointSize() !== 'xl') {
this.shrinkView();
}
this.expandViewContainer();