Add latest changes from gitlab-org/gitlab@master

5 files changed, 5 insertions, 5 deletions

diff --git a/spec/frontend/u2f/authenticate_spec.js b/spec/frontend/authentication/u2f/authenticate_spec.js
index 1d39c4857ae..36cc6fb7c63 100644
--- a/spec/frontend/u2f/authenticate_spec.js
+++ b/spec/frontend/authentication/u2f/authenticate_spec.js
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import U2FAuthenticate from '~/u2f/authenticate';
+import U2FAuthenticate from '~/authentication/u2f/authenticate';
 import 'vendor/u2f';
 import MockU2FDevice from './mock_u2f_device';
 
diff --git a/spec/frontend/u2f/mock_u2f_device.js b/spec/frontend/authentication/u2f/mock_u2f_device.js
index ec8425a4e3e..ec8425a4e3e 100644
--- a/spec/frontend/u2f/mock_u2f_device.js
+++ b/spec/frontend/authentication/u2f/mock_u2f_device.js
diff --git a/spec/frontend/u2f/register_spec.js b/spec/frontend/authentication/u2f/register_spec.js
index a4395a2123a..3c2ecdbba66 100644
--- a/spec/frontend/u2f/register_spec.js
+++ b/spec/frontend/authentication/u2f/register_spec.js
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import U2FRegister from '~/u2f/register';
+import U2FRegister from '~/authentication/u2f/register';
 import 'vendor/u2f';
 import MockU2FDevice from './mock_u2f_device';
 
diff --git a/spec/frontend/u2f/util_spec.js b/spec/frontend/authentication/u2f/util_spec.js
index 32cd6891384..67fd4c73243 100644
--- a/spec/frontend/u2f/util_spec.js
+++ b/spec/frontend/authentication/u2f/util_spec.js
@@ -1,4 +1,4 @@
-import { canInjectU2fApi } from '~/u2f/util';
+import { canInjectU2fApi } from '~/authentication/u2f/util';
 
 describe('U2F Utils', () => {
   describe('canInjectU2fApi', () => {
diff --git a/spec/frontend/fixtures/static/issue_with_mermaid_graph.html b/spec/frontend/fixtures/static/issue_with_mermaid_graph.html
index 4b60842a655..e9fa75c8ba9 100644
--- a/spec/frontend/fixtures/static/issue_with_mermaid_graph.html
+++ b/spec/frontend/fixtures/static/issue_with_mermaid_graph.html
@@ -15,14 +15,14 @@
           <g class="edgeLabels"></g>
           <g class="nodes">
             <g
-              class="node js-issuable-actions btn-close clickable"
+              class="node js-issuable-buttons btn-close clickable"
               style="opacity: 1;"
               id="A"
               transform="translate(92.67500305175781,25.25)"
               title="click to PUT"
             >
               <a
-                class="js-issuable-actions btn-close clickable"
+                class="js-issuable-buttons btn-close clickable"
                 href="https://invalid"
                 rel="noopener"
               >