diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
commit | 0c872e02b2c822e3397515ec324051ff540f0cd5 (patch) | |
tree | ce2fb6ce7030e4dad0f4118d21ab6453e5938cdd /app/controllers/profiles | |
parent | f7e05a6853b12f02911494c4b3fe53d9540d74fc (diff) |
Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42
Diffstat (limited to 'app/controllers/profiles')
-rw-r--r-- | app/controllers/profiles/keys_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/profiles/preferences_controller.rb | 3 | ||||
-rw-r--r-- | app/controllers/profiles/two_factor_auths_controller.rb | 16 |
3 files changed, 11 insertions, 10 deletions
diff --git a/app/controllers/profiles/keys_controller.rb b/app/controllers/profiles/keys_controller.rb index 90d5f945d78..39e8f6c500d 100644 --- a/app/controllers/profiles/keys_controller.rb +++ b/app/controllers/profiles/keys_controller.rb @@ -37,6 +37,6 @@ class Profiles::KeysController < Profiles::ApplicationController private def key_params - params.require(:key).permit(:title, :key, :expires_at) + params.require(:key).permit(:title, :key, :usage_type, :expires_at) end end diff --git a/app/controllers/profiles/preferences_controller.rb b/app/controllers/profiles/preferences_controller.rb index a57c87bf691..974e7104c07 100644 --- a/app/controllers/profiles/preferences_controller.rb +++ b/app/controllers/profiles/preferences_controller.rb @@ -57,7 +57,8 @@ class Profiles::PreferencesController < Profiles::ApplicationController :render_whitespace_in_code, :markdown_surround_selection, :markdown_automatic_lists, - :use_legacy_web_ide + :use_legacy_web_ide, + :use_new_navigation ] end end diff --git a/app/controllers/profiles/two_factor_auths_controller.rb b/app/controllers/profiles/two_factor_auths_controller.rb index 0933f2bb7ea..03b7cc9f892 100644 --- a/app/controllers/profiles/two_factor_auths_controller.rb +++ b/app/controllers/profiles/two_factor_auths_controller.rb @@ -97,7 +97,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController def skip if two_factor_grace_period_expired? - redirect_to new_profile_two_factor_auth_path, alert: s_('Cannot skip two factor authentication setup') + redirect_to new_profile_two_factor_auth_path, alert: _('Cannot skip two factor authentication setup') else session[:skip_two_factor] = current_user.otp_grace_period_started_at + two_factor_grace_period.hours redirect_to root_path @@ -186,9 +186,9 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController def u2f_registrations current_user.u2f_registrations.map do |u2f_registration| { - name: u2f_registration.name, - created_at: u2f_registration.created_at, - delete_path: profile_u2f_registration_path(u2f_registration) + name: u2f_registration.name, + created_at: u2f_registration.created_at, + delete_path: profile_u2f_registration_path(u2f_registration) } end end @@ -196,9 +196,9 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController def webauthn_registrations current_user.webauthn_registrations.map do |webauthn_registration| { - name: webauthn_registration.name, - created_at: webauthn_registration.created_at, - delete_path: profile_webauthn_registration_path(webauthn_registration) + name: webauthn_registration.name, + created_at: webauthn_registration.created_at, + delete_path: profile_webauthn_registration_path(webauthn_registration) } end end @@ -216,7 +216,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController group_links = groups.map { |group| view_context.link_to group.full_name, group_path(group) }.to_sentence leave_group_links = groups.map { |group| view_context.link_to (s_("leave %{group_name}") % { group_name: group.full_name }), leave_group_members_path(group), remote: false, method: :delete }.to_sentence - s_(%{The group settings for %{group_links} require you to enable Two-Factor Authentication for your account. You can %{leave_group_links}.}) + s_(%(The group settings for %{group_links} require you to enable Two-Factor Authentication for your account. You can %{leave_group_links}.)) .html_safe % { group_links: group_links.html_safe, leave_group_links: leave_group_links.html_safe } end |