kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2020-10-17 06:09:20 +00:00
parent d30791e2e9
commit 4ab8c40e15
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/notes/index.js
View File

@ -5,11 +5,9 @@ import initSortDiscussions from './sort_discussions';
import initTimelineToggle from './timeline'; import initTimelineToggle from './timeline';
import { store } from './stores'; import { store } from './stores';
document.addEventListener('DOMContentLoaded', () => { const el = document.getElementById('js-vue-notes');
const el = document.getElementById('js-vue-notes');
if (!el) return;
if (el) {
// eslint-disable-next-line no-new // eslint-disable-next-line no-new
new Vue({ new Vue({
el, el,
@ -61,4 +59,4 @@ document.addEventListener('DOMContentLoaded', () => {
initDiscussionFilters(store); initDiscussionFilters(store);
initSortDiscussions(store); initSortDiscussions(store);
initTimelineToggle(store); initTimelineToggle(store);
}); }

4
app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue
View File

@ -10,7 +10,6 @@ import getStateQuery from '../../queries/get_state.query.graphql';
import workInProgressQuery from '../../queries/states/work_in_progress.query.graphql'; import workInProgressQuery from '../../queries/states/work_in_progress.query.graphql';
import removeWipMutation from '../../queries/toggle_wip.mutation.graphql'; import removeWipMutation from '../../queries/toggle_wip.mutation.graphql';
import StatusIcon from '../mr_widget_status_icon.vue'; import StatusIcon from '../mr_widget_status_icon.vue';
import tooltip from '../../../vue_shared/directives/tooltip';
import eventHub from '../../event_hub'; import eventHub from '../../event_hub';
export default { export default {
@ -19,9 +18,6 @@ export default {
StatusIcon, StatusIcon,
GlButton, GlButton,
}, },
directives: {
tooltip,
},
mixins: [glFeatureFlagMixin(), mergeRequestQueryVariablesMixin], mixins: [glFeatureFlagMixin(), mergeRequestQueryVariablesMixin],
apollo: { apollo: {
userPermissions: { userPermissions: {