From 8ac5fc8deebee73d7492f0fb8d825ccef3b01870 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 21 Jun 2022 06:08:28 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../projects/commits/components/author_select.vue | 2 +- doc/api/users.md | 4 ++-- package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/projects/commits/components/author_select.vue b/app/assets/javascripts/projects/commits/components/author_select.vue index 884ef732144..f85be67d4b3 100644 --- a/app/assets/javascripts/projects/commits/components/author_select.vue +++ b/app/assets/javascripts/projects/commits/components/author_select.vue @@ -110,7 +110,7 @@ export default { :text="dropdownText" :disabled="hasSearchParam" toggle-class="gl-py-3 gl-border-0" - class="w-100 mt-2 mt-sm-0" + class="w-100 gl-mt-3 mt-sm-0" > {{ __('Search by author') }} diff --git a/doc/api/users.md b/doc/api/users.md index a84b236d1e3..ddd7de58228 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -2011,7 +2011,7 @@ Administrators cannot disable 2FA for their own user account or other administra administrator's 2FA [using the Rails console](../security/two_factor_authentication.md#for-a-single-user). ```plaintext -PATCH /user/:id/disable_two_factor +PATCH /users/:id/disable_two_factor ``` Parameters: @@ -2021,7 +2021,7 @@ Parameters: | `id` | integer | yes | The ID of the user | ```shell -curl --request PATCH --header "PRIVATE-TOKEN: " "https://gitlab.example.com/api/v4/user/1/disable_two_factor" +curl --request PATCH --header "PRIVATE-TOKEN: " "https://gitlab.example.com/api/v4/users/1/disable_two_factor" ``` Returns: diff --git a/package.json b/package.json index f1589d5d37f..a1f512213d7 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "codesandbox-api": "0.0.23", "compression-webpack-plugin": "^5.0.2", "copy-webpack-plugin": "^6.4.1", - "core-js": "^3.23.1", + "core-js": "^3.23.2", "cron-validator": "^1.1.1", "cronstrue": "^1.122.0", "cropper": "^2.3.0", diff --git a/yarn.lock b/yarn.lock index 7bbe41b71e7..8c975617476 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3965,10 +3965,10 @@ core-js-pure@^3.0.0: resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813" integrity sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA== -core-js@^3.23.1: - version "3.23.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.23.1.tgz#9f9a9255115f62c512db56d567f636da32ca0b78" - integrity sha512-wfMYHWi1WQjpgZNC9kAlN4ut04TM9fUTdi7CqIoTVM7yaiOUQTklOzfb+oWH3r9edQcT3F887swuVmxrV+CC8w== +core-js@^3.23.2: + version "3.23.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.23.2.tgz#e07a60ca8b14dd129cabdc3d2551baf5a01c76f0" + integrity sha512-ELJOWxNrJfOH/WK4VJ3Qd+fOqZuOuDNDJz0xG6Bt4mGg2eO/UT9CljCrbqDGovjLKUrGajEEBcoTOc0w+yBYeQ== core-js@~2.3.0: version "2.3.0"