diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 19:00:14 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 19:00:14 +0000 |
| commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
| tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/controllers/profiles | |
| parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) | |
| download | gitlab-ce-05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/controllers/profiles')
| -rw-r--r-- | app/controllers/profiles/avatars_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/profiles/two_factor_auths_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/profiles/avatars_controller.rb b/app/controllers/profiles/avatars_controller.rb index d9e4b9a149d..55a2904ce83 100644 --- a/app/controllers/profiles/avatars_controller.rb +++ b/app/controllers/profiles/avatars_controller.rb @@ -6,7 +6,7 @@ class Profiles::AvatarsController < Profiles::ApplicationController def destroy @user = current_user - Users::UpdateService.new(current_user, user: @user).execute { |user| user.remove_avatar! } + Users::UpdateService.new(current_user, user: @user).execute(&:remove_avatar!) redirect_to profile_path, status: :found end diff --git a/app/controllers/profiles/two_factor_auths_controller.rb b/app/controllers/profiles/two_factor_auths_controller.rb index 03b7cc9f892..c36f03d3e69 100644 --- a/app/controllers/profiles/two_factor_auths_controller.rb +++ b/app/controllers/profiles/two_factor_auths_controller.rb @@ -206,7 +206,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController def webauthn_options WebAuthn::Credential.options_for_create( user: { id: current_user.webauthn_xid, name: current_user.username }, - exclude: current_user.webauthn_registrations.map { |c| c.credential_xid }, + exclude: current_user.webauthn_registrations.map(&:credential_xid), authenticator_selection: { user_verification: 'discouraged' }, rp: { name: 'GitLab' } ) |