diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-14 21:11:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-14 21:11:02 +0300 |
| commit | 0ce623783c5970e2439cda2a5eab8cbb81c194c3 (patch) | |
| tree | 2bd6904b7e7a6b3c3539de89e86e60420c430452 /app/helpers | |
| parent | d7e72d98df261209772ce059e09381d36226913f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/projects/terraform_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/projects_helper.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/projects/terraform_helper.rb b/app/helpers/projects/terraform_helper.rb index fb35224fad3..22cd9eb5c9b 100644 --- a/app/helpers/projects/terraform_helper.rb +++ b/app/helpers/projects/terraform_helper.rb @@ -6,7 +6,7 @@ module Projects::TerraformHelper empty_state_image: image_path('illustrations/empty-state/empty-serverless-lg.svg'), project_path: project.full_path, terraform_admin: current_user&.can?(:admin_terraform_state, project), - access_tokens_path: profile_personal_access_tokens_path, + access_tokens_path: user_settings_personal_access_tokens_path, username: current_user&.username, terraform_api_url: "#{Settings.gitlab.url}/api/v4/projects/#{project.id}/terraform/state" } diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 6da2864b4c1..a821d014592 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -244,7 +244,7 @@ module ProjectsHelper push_pull_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('topics/git/terminology', anchor: 'pull-and-push') } clone_with_https_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('gitlab-basics/start-using-git', anchor: 'clone-with-https') } set_password_link_start = '<a href="%{url}">'.html_safe % { url: edit_profile_password_path } - set_up_pat_link_start = '<a href="%{url}">'.html_safe % { url: profile_personal_access_tokens_path } + set_up_pat_link_start = '<a href="%{url}">'.html_safe % { url: user_settings_personal_access_tokens_path } message = if current_user.require_password_creation_for_git? _('Your account is authenticated with SSO or SAML. To %{push_pull_link_start}push and pull%{link_end} over %{protocol} with Git using this account, you must %{set_password_link_start}set a password%{link_end} or %{set_up_pat_link_start}set up a Personal Access Token%{link_end} to use instead of a password. For more information, see %{clone_with_https_link_start}Clone with HTTPS%{link_end}.') |