diff options
Diffstat (limited to 'app/assets')
4 files changed, 8 insertions, 10 deletions
diff --git a/app/assets/javascripts/behaviors/markdown/nodes/playable.js b/app/assets/javascripts/behaviors/markdown/nodes/playable.js index 08539df1242..9209c69d04a 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/playable.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/playable.js @@ -42,7 +42,7 @@ export default class Playable extends Node { }, { tag: `${this.mediaType}[src]`, - getAttrs: el => ({ src: el.getAttribute('src'), alt: el.dataset.title }), + getAttrs: el => ({ src: el.src, alt: el.dataset.title }), }, ]; diff --git a/app/assets/javascripts/diffs/components/diff_stats.vue b/app/assets/javascripts/diffs/components/diff_stats.vue index 2e5855380af..5329cb1e241 100644 --- a/app/assets/javascripts/diffs/components/diff_stats.vue +++ b/app/assets/javascripts/diffs/components/diff_stats.vue @@ -1,6 +1,7 @@ <script> import Icon from '~/vue_shared/components/icon.vue'; import { n__ } from '~/locale'; +import { isNumber } from 'underscore'; export default { components: { Icon }, @@ -16,7 +17,7 @@ export default { diffFilesLength: { type: Number, required: false, - default: null, + default: 0, }, }, computed: { @@ -26,6 +27,9 @@ export default { isCompareVersionsHeader() { return Boolean(this.diffFilesLength); }, + hasDiffFiles() { + return isNumber(this.diffFilesLength) && this.diffFilesLength >= 0; + }, }, }; </script> @@ -38,7 +42,7 @@ export default { 'd-inline-flex': !isCompareVersionsHeader, }" > - <div v-if="diffFilesLength !== null" class="diff-stats-group"> + <div v-if="hasDiffFiles" class="diff-stats-group"> <icon name="doc-code" class="diff-stats-icon text-secondary" /> <strong>{{ diffFilesLength }} {{ filesText }}</strong> </div> diff --git a/app/assets/javascripts/pages/registrations/welcome/index.js b/app/assets/javascripts/pages/registrations/welcome/index.js deleted file mode 100644 index 2d555fa7977..00000000000 --- a/app/assets/javascripts/pages/registrations/welcome/index.js +++ /dev/null @@ -1,7 +0,0 @@ -import LengthValidator from '~/pages/sessions/new/length_validator'; -import NoEmojiValidator from '~/emoji/no_emoji_validator'; - -document.addEventListener('DOMContentLoaded', () => { - new LengthValidator(); // eslint-disable-line no-new - new NoEmojiValidator(); // eslint-disable-line no-new -}); diff --git a/app/assets/stylesheets/pages/prometheus.scss b/app/assets/stylesheets/pages/prometheus.scss index 2138231aaed..8133a167687 100644 --- a/app/assets/stylesheets/pages/prometheus.scss +++ b/app/assets/stylesheets/pages/prometheus.scss @@ -47,6 +47,7 @@ } .prometheus-graphs-header { + .monitor-environment-dropdown-header header, .monitor-dashboard-dropdown-header header { font-size: $gl-font-size; } |