diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 06:08:55 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 06:08:55 +0000 |
commit | cfe63cce6a90a1c70397c1b9f6d90480f25cae0a (patch) | |
tree | edd6c21505a2f6afc8c6c6b9e69e6233a045c95b /app | |
parent | 56201db1dc66f3a2d598f6f8da0bec170dc26ba1 (diff) | |
download | gitlab-ce-cfe63cce6a90a1c70397c1b9f6d90480f25cae0a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/behaviors/markdown/marks/inline_html.js | 4 | ||||
-rw-r--r-- | app/assets/javascripts/behaviors/requires_input.js | 6 | ||||
-rw-r--r-- | app/assets/javascripts/single_file_diff.js | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/behaviors/markdown/marks/inline_html.js b/app/assets/javascripts/behaviors/markdown/marks/inline_html.js index ebed8698e21..7e020139fe7 100644 --- a/app/assets/javascripts/behaviors/markdown/marks/inline_html.js +++ b/app/assets/javascripts/behaviors/markdown/marks/inline_html.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ import { Mark } from 'tiptap'; -import _ from 'underscore'; +import { escape as esc } from 'lodash'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class InlineHTML extends Mark { @@ -35,7 +35,7 @@ export default class InlineHTML extends Mark { mixable: true, open(state, mark) { return `<${mark.attrs.tag}${ - mark.attrs.title ? ` title="${state.esc(_.escape(mark.attrs.title))}"` : '' + mark.attrs.title ? ` title="${state.esc(esc(mark.attrs.title))}"` : '' }>`; }, close(state, mark) { diff --git a/app/assets/javascripts/behaviors/requires_input.js b/app/assets/javascripts/behaviors/requires_input.js index 7cf18d1fd83..2fa3f4fc789 100644 --- a/app/assets/javascripts/behaviors/requires_input.js +++ b/app/assets/javascripts/behaviors/requires_input.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import _ from 'underscore'; +import { isEmpty } from 'lodash'; import '../commons/bootstrap'; // Requires Input behavior @@ -23,10 +23,10 @@ $.fn.requiresInput = function requiresInput() { function requireInput() { // Collect the input values of *all* required fields - const values = _.map($(fieldSelector, $form), field => field.value); + const values = Array.from($(fieldSelector, $form)).map(field => field.value); // Disable the button if any required fields are empty - if (values.length && _.some(values, _.isEmpty)) { + if (values.length && values.some(isEmpty)) { $button.disable(); } else { $button.enable(); diff --git a/app/assets/javascripts/single_file_diff.js b/app/assets/javascripts/single_file_diff.js index de4a7f89449..2d505c4c96b 100644 --- a/app/assets/javascripts/single_file_diff.js +++ b/app/assets/javascripts/single_file_diff.js @@ -9,7 +9,7 @@ import initImageDiffHelper from './image_diff/helpers/init_image_diff'; import syntaxHighlight from './syntax_highlight'; const WRAPPER = '<div class="diff-content"></div>'; -const LOADING_HTML = '<i class="fa fa-spinner fa-spin"></i>'; +const LOADING_HTML = '<span class="spinner"></span>'; const ERROR_HTML = '<div class="nothing-here-block"><i class="fa fa-warning"></i> Could not load diff</div>'; const COLLAPSED_HTML = |