Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-06 18:07:26 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-06 18:07:26 +0300
commit506159637da758f448818b834f8482238a9eb4eb (patch)
treee114c46da6c1b98451a228b7559f5a6039c5df29 /spec/frontend/pages
parent045c0f9554a99c80d0a127540da168e272a9f977 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/pages')
-rw-r--r--spec/frontend/pages/admin/users/components/__snapshots__/delete_user_modal_spec.js.snap14
-rw-r--r--spec/frontend/pages/admin/users/components/__snapshots__/user_operation_confirmation_modal_spec.js.snap4
2 files changed, 9 insertions, 9 deletions
diff --git a/spec/frontend/pages/admin/users/components/__snapshots__/delete_user_modal_spec.js.snap b/spec/frontend/pages/admin/users/components/__snapshots__/delete_user_modal_spec.js.snap
index 78a736a9060..d5ce2c1ee24 100644
--- a/spec/frontend/pages/admin/users/components/__snapshots__/delete_user_modal_spec.js.snap
+++ b/spec/frontend/pages/admin/users/components/__snapshots__/delete_user_modal_spec.js.snap
@@ -29,7 +29,7 @@ exports[`User Operation confirmation modal renders modal with form included 1`]
value="csrf"
/>
- <glforminput-stub
+ <gl-form-input-stub
autocomplete="off"
autofocus=""
name="username"
@@ -38,26 +38,26 @@ exports[`User Operation confirmation modal renders modal with form included 1`]
/>
</form>
- <glbutton-stub
+ <gl-button-stub
variant="secondary"
>
Cancel
- </glbutton-stub>
+ </gl-button-stub>
- <glbutton-stub
+ <gl-button-stub
disabled="true"
variant="warning"
>
secondaryAction
- </glbutton-stub>
+ </gl-button-stub>
- <glbutton-stub
+ <gl-button-stub
disabled="true"
variant="danger"
>
action
- </glbutton-stub>
+ </gl-button-stub>
</div>
`;
diff --git a/spec/frontend/pages/admin/users/components/__snapshots__/user_operation_confirmation_modal_spec.js.snap b/spec/frontend/pages/admin/users/components/__snapshots__/user_operation_confirmation_modal_spec.js.snap
index 4a3989f5192..4b4e9997953 100644
--- a/spec/frontend/pages/admin/users/components/__snapshots__/user_operation_confirmation_modal_spec.js.snap
+++ b/spec/frontend/pages/admin/users/components/__snapshots__/user_operation_confirmation_modal_spec.js.snap
@@ -1,7 +1,7 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`User Operation confirmation modal renders modal with form included 1`] = `
-<glmodal-stub
+<gl-modal-stub
modalclass=""
modalid="user-operation-modal"
ok-title="action"
@@ -29,5 +29,5 @@ exports[`User Operation confirmation modal renders modal with form included 1`]
value="csrf"
/>
</form>
-</glmodal-stub>
+</gl-modal-stub>
`;