diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 21:09:20 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 21:09:20 +0000 |
commit | 06be418a7cd98a1c87c41ba43cca1ce9acbe885e (patch) | |
tree | 218a068630ae2dbe87b32a67a7f2b77d631e0db9 /app | |
parent | eb1f5a3e087b7d6a3e85f2724b5a475cc9d9d37d (diff) | |
download | gitlab-ce-06be418a7cd98a1c87c41ba43cca1ce9acbe885e.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
5 files changed, 46 insertions, 51 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_file_row.vue b/app/assets/javascripts/diffs/components/diff_file_row.vue index 5aaed0d40db..15e63a1c9ca 100644 --- a/app/assets/javascripts/diffs/components/diff_file_row.vue +++ b/app/assets/javascripts/diffs/components/diff_file_row.vue @@ -5,12 +5,14 @@ */ import FileRow from '~/vue_shared/components/file_row.vue'; import FileRowStats from './file_row_stats.vue'; +import ChangedFileIcon from '~/vue_shared/components/changed_file_icon.vue'; export default { name: 'DiffFileRow', components: { FileRow, FileRowStats, + ChangedFileIcon, }, props: { file: { @@ -31,7 +33,8 @@ export default { </script> <template> - <file-row :file="file" :hide-file-stats="hideFileStats" v-bind="$attrs" v-on="$listeners"> - <file-row-stats v-if="showFileRowStats" :file="file" /> + <file-row :file="file" v-bind="$attrs" v-on="$listeners"> + <file-row-stats v-if="showFileRowStats" :file="file" class="mr-1" /> + <changed-file-icon :file="file" :size="16" /> </file-row> </template> diff --git a/app/assets/javascripts/diffs/components/tree_list.vue b/app/assets/javascripts/diffs/components/tree_list.vue index 1eac3430a20..eca9091f92f 100644 --- a/app/assets/javascripts/diffs/components/tree_list.vue +++ b/app/assets/javascripts/diffs/components/tree_list.vue @@ -95,8 +95,6 @@ export default { :file="file" :level="0" :hide-file-stats="hideFileStats" - :hide-extra-on-tree="true" - :show-changed-icon="true" :file-row-component="$options.DiffFileRow" @toggleTreeOpen="toggleTreeOpen" @clickFile="scrollToFile" diff --git a/app/assets/javascripts/self_monitor/components/self_monitor_form.vue b/app/assets/javascripts/self_monitor/components/self_monitor_form.vue index 2f364eae67f..6b19a72317c 100644 --- a/app/assets/javascripts/self_monitor/components/self_monitor_form.vue +++ b/app/assets/javascripts/self_monitor/components/self_monitor_form.vue @@ -106,7 +106,7 @@ export default { saveChangesSelfMonitorProject() { if (this.projectCreated && !this.projectEnabled) { this.showSelfMonitorModal(); - } else { + } else if (!this.projectCreated && !this.loading) { this.createProject(); } }, diff --git a/app/assets/javascripts/user_popovers.js b/app/assets/javascripts/user_popovers.js index 67e5f175039..5cc22f62262 100644 --- a/app/assets/javascripts/user_popovers.js +++ b/app/assets/javascripts/user_popovers.js @@ -60,43 +60,45 @@ export default (elements = document.querySelectorAll('.js-user-link')) => { const userLinks = Array.from(elements); const UserPopoverComponent = Vue.extend(UserPopover); - return userLinks.map(el => { - if (initializedPopovers.has(el)) { - return initializedPopovers.get(el); - } - - const user = { - location: null, - bio: null, - organization: null, - status: null, - loaded: false, - }; - const renderedPopover = new UserPopoverComponent({ - propsData: { - target: el, - user, - }, - }); - - initializedPopovers.set(el, renderedPopover); - - renderedPopover.$mount(); - - el.addEventListener('mouseenter', ({ target }) => { - removeTitle(target); - const preloadedUserInfo = getPreloadedUserInfo(target.dataset); - - Object.assign(user, preloadedUserInfo); - - if (preloadedUserInfo.userId) { - populateUserInfo(user); + return userLinks + .filter(({ dataset }) => dataset.user || dataset.userId) + .map(el => { + if (initializedPopovers.has(el)) { + return initializedPopovers.get(el); } - }); - el.addEventListener('mouseleave', ({ target }) => { - target.removeAttribute('aria-describedby'); - }); - return renderedPopover; - }); + const user = { + location: null, + bio: null, + organization: null, + status: null, + loaded: false, + }; + const renderedPopover = new UserPopoverComponent({ + propsData: { + target: el, + user, + }, + }); + + initializedPopovers.set(el, renderedPopover); + + renderedPopover.$mount(); + + el.addEventListener('mouseenter', ({ target }) => { + removeTitle(target); + const preloadedUserInfo = getPreloadedUserInfo(target.dataset); + + Object.assign(user, preloadedUserInfo); + + if (preloadedUserInfo.userId) { + populateUserInfo(user); + } + }); + el.addEventListener('mouseleave', ({ target }) => { + target.removeAttribute('aria-describedby'); + }); + + return renderedPopover; + }); }; diff --git a/app/assets/javascripts/vue_shared/components/file_row.vue b/app/assets/javascripts/vue_shared/components/file_row.vue index 1ea6eb2628b..578fcc819b0 100644 --- a/app/assets/javascripts/vue_shared/components/file_row.vue +++ b/app/assets/javascripts/vue_shared/components/file_row.vue @@ -1,14 +1,12 @@ <script> import FileHeader from '~/vue_shared/components/file_row_header.vue'; import FileIcon from '~/vue_shared/components/file_icon.vue'; -import ChangedFileIcon from '~/vue_shared/components/changed_file_icon.vue'; export default { name: 'FileRow', components: { FileHeader, FileIcon, - ChangedFileIcon, }, props: { file: { @@ -19,11 +17,6 @@ export default { type: Number, required: true, }, - showChangedIcon: { - type: Boolean, - required: false, - default: false, - }, }, computed: { isTree() { @@ -121,15 +114,14 @@ export default { <div class="file-row-name-container"> <span ref="textOutput" :style="levelIndentation" class="file-row-name str-truncated"> <file-icon - v-if="!showChangedIcon || file.type === 'tree'" class="file-row-icon" + :class="{ 'text-secondary': file.type === 'tree' }" :file-name="file.name" :loading="file.loading" :folder="isTree" :opened="file.opened" :size="16" /> - <changed-file-icon v-else :file="file" :size="16" class="append-right-5" /> {{ file.name }} </span> <slot></slot> |