Add latest changes from gitlab-org/gitlab@master

5 files changed, 25 insertions, 28 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 =
diff --git a/doc/user/group/epics/index.md b/doc/user/group/epics/index.md
index 96d04598b12..91d6984efc5 100644
--- a/doc/user/group/epics/index.md
+++ b/doc/user/group/epics/index.md
@@ -4,8 +4,8 @@ type: reference, howto
 
 # Epics **(PREMIUM)**
 
-> Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.2.
-> In [GitLab 12.8](https://gitlab.com/gitlab-org/gitlab/issues/37081), single-level Epics were moved to Premium tier.
+> - Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.2.
+> - In [GitLab 12.8](https://gitlab.com/gitlab-org/gitlab/issues/37081), single-level Epics were moved to Premium tier.
 
 Epics let you manage your portfolio of projects more efficiently and with less
 effort by tracking groups of issues that share a theme, across projects and
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 75ed5c04472..c7590ccb1fb 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -11256,19 +11256,31 @@ msgstr ""
 msgid "LicenseCompliance|Add licenses manually to approve or blacklist"
 msgstr ""
 
-msgid "LicenseCompliance|Allow"
+msgid "LicenseCompliance|Approve"
 msgstr ""
 
-msgid "LicenseCompliance|Allowed"
+msgid "LicenseCompliance|Approve license"
 msgstr ""
 
-msgid "LicenseCompliance|Cancel"
+msgid "LicenseCompliance|Approve license?"
+msgstr ""
+
+msgid "LicenseCompliance|Approved"
+msgstr ""
+
+msgid "LicenseCompliance|Blacklist"
 msgstr ""
 
-msgid "LicenseCompliance|Denied"
+msgid "LicenseCompliance|Blacklist license"
 msgstr ""
 
-msgid "LicenseCompliance|Deny"
+msgid "LicenseCompliance|Blacklist license?"
+msgstr ""
+
+msgid "LicenseCompliance|Blacklisted"
+msgstr ""
+
+msgid "LicenseCompliance|Cancel"
 msgstr ""
 
 msgid "LicenseCompliance|Here you can approve or blacklist licenses for this project. Using %{ci} or %{license} will allow you to see if there are any unmanaged licenses and approve or blacklist them in merge request."
@@ -11312,9 +11324,6 @@ msgstr ""
 msgid "LicenseCompliance|License name"
 msgstr ""
 
-msgid "LicenseCompliance|License review"
-msgstr ""
-
 msgid "LicenseCompliance|Packages"
 msgstr ""
 
@@ -11360,9 +11369,6 @@ msgstr ""
 msgid "Licenses|Components"
 msgstr ""
 
-msgid "Licenses|Detected in Project"
-msgstr ""
-
 msgid "Licenses|Displays licenses detected in the project, based on the %{linkStart}latest pipeline%{linkEnd} scan"
 msgstr ""
 
@@ -11378,15 +11384,6 @@ msgstr ""
 msgid "Licenses|Name"
 msgstr ""
 
-msgid "Licenses|Policies"
-msgstr ""
-
-msgid "Licenses|Policy"
-msgstr ""
-
-msgid "Licenses|Specified policies in this project"
-msgstr ""
-
 msgid "Licenses|The license list details information about the licenses used within your project."
 msgstr ""