diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-04 18:17:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-04 18:17:13 +0300 |
commit | 4bdfcf93f224edb9c4daff90d95b0c6c92766ea3 (patch) | |
tree | cedf1f94561571d00033c48846ad3959af64449b /app/views | |
parent | fb5d3cceb8d43f8c2dc22a5d8c74327e9397f2e8 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
6 files changed, 7 insertions, 4 deletions
diff --git a/app/views/import/_githubish_status.html.haml b/app/views/import/_githubish_status.html.haml index 8545b5fd71d..5eae48fd237 100644 --- a/app/views/import/_githubish_status.html.haml +++ b/app/views/import/_githubish_status.html.haml @@ -8,6 +8,7 @@ - details_path = local_assigns.fetch(:details_path, nil) - provider_title = Gitlab::ImportSources.title(local_assigns.fetch(:provider)) - optional_stages = local_assigns.fetch(:optional_stages, []) +- status_import_github_group_path = local_assigns.fetch(:status_import_github_group_path, '') - header_title _("New project"), new_project_path - add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project') @@ -19,6 +20,7 @@ jobs_path: url_for([:realtime_changes, :import, provider, { format: :json }]), default_target_namespace: default_namespace_path, import_path: url_for([:import, provider, { format: :json }]), + status_import_github_group_path: status_import_github_group_path, cancel_path: cancel_path, details_path: details_path, filterable: filterable.to_s, diff --git a/app/views/import/github/status.html.haml b/app/views/import/github/status.html.haml index 45b5a9408be..b07374e5b5f 100644 --- a/app/views/import/github/status.html.haml +++ b/app/views/import/github/status.html.haml @@ -12,4 +12,5 @@ default_namespace: @namespace, cancel_path: cancel_import_github_path, details_path: details_import_github_path, + status_import_github_group_path: status_import_github_group_path(format: :json), optional_stages: Gitlab::GithubImport::Settings.stages_array diff --git a/app/views/notify/service_desk_verification_result_email.html.haml b/app/views/notify/service_desk_verification_result_email.html.haml index d63177e4a42..c072744c43c 100644 --- a/app/views/notify/service_desk_verification_result_email.html.haml +++ b/app/views/notify/service_desk_verification_result_email.html.haml @@ -14,7 +14,7 @@ %tr %td.text-content - - if @verification.verified? + - if @verification.finished? %h1{ :style => "margin-top:0;" } = s_("Notify|Email successfully verified") %p diff --git a/app/views/notify/service_desk_verification_result_email.text.erb b/app/views/notify/service_desk_verification_result_email.text.erb index a78e3b19d1e..65b0cba5616 100644 --- a/app/views/notify/service_desk_verification_result_email.text.erb +++ b/app/views/notify/service_desk_verification_result_email.text.erb @@ -2,7 +2,7 @@ <% email_address = @service_desk_setting.custom_email %> <% verify_email_address = @service_desk_setting.custom_email_address_for_verification %> -<% if @verification.verified? %> +<% if @verification.finished? %> <%= s_("Notify|Email successfully verified") %> <%= s_('Notify|Your email address %{strong_open}%{email_address}%{strong_close} for the Service Desk of %{project_link_start}%{project_name}%{project_link_end} was verified successfully.') % { email_address: email_address, project_link_start: '', project_name: project_name, project_link_end: '', strong_open: '', strong_close: '' } %> diff --git a/app/views/projects/issues/service_desk/_nav_btns.html.haml b/app/views/projects/issues/service_desk/_nav_btns.html.haml index 9b16dbe761f..a0a290f340a 100644 --- a/app/views/projects/issues/service_desk/_nav_btns.html.haml +++ b/app/views/projects/issues/service_desk/_nav_btns.html.haml @@ -7,7 +7,7 @@ .nav-controls.issues-nav-controls.gl-font-size-0 - if @can_bulk_update - = button_tag _("Edit issues"), class: "gl-button btn btn-default gl-mr-3 js-bulk-update-toggle" + = button_tag _("Bulk edit"), class: "gl-button btn btn-default gl-mr-3 js-bulk-update-toggle" - if show_new_issue_link?(@project) = link_to _("New issue"), new_project_issue_path(@project, issue: { milestone_id: finder.milestones.first.try(:id) }), diff --git a/app/views/projects/merge_requests/_nav_btns.html.haml b/app/views/projects/merge_requests/_nav_btns.html.haml index 6cb1eee01c4..80085cc6a34 100644 --- a/app/views/projects/merge_requests/_nav_btns.html.haml +++ b/app/views/projects/merge_requests/_nav_btns.html.haml @@ -3,7 +3,7 @@ - if @can_bulk_update = render Pajamas::ButtonComponent.new(type: :submit, button_options: { class: 'gl-mr-3 js-bulk-update-toggle' }) do - = _("Edit merge requests") + = _("Bulk edit") - if merge_project = render Pajamas::ButtonComponent.new(href: new_merge_request_path, variant: :confirm) do = _("New merge request") |