diff options
Diffstat (limited to 'app/views/projects')
48 files changed, 124 insertions, 235 deletions
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index 86172499118..8909536a1ec 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -1,6 +1,5 @@ - empty_repo = @project.empty_repo? - show_auto_devops_callout = show_auto_devops_callout?(@project) -- max_project_topic_length = 15 - emails_disabled = @project.emails_disabled? - cache_enabled = Feature.enabled?(:cache_home_panel, @project, type: :development, default_enabled: :yaml) @@ -25,24 +24,8 @@ %span.access-request-links.gl-ml-3 = render 'shared/members/access_request_links', source: @project - - if @project.topic_list.present? - = cache_if(cache_enabled, [@project, :topic_list], expires_in: 1.day) do - %span.home-panel-topic-list.mt-2.w-100.d-inline-flex.gl-font-base.gl-font-weight-normal.gl-align-items-center - = sprite_icon('tag', css_class: 'icon gl-relative gl-mr-2') - - - @project.topics_to_show.each do |topic| - - project_topics_classes = "badge badge-pill badge-secondary gl-mr-2" - - explore_project_topic_path = explore_projects_path(topic: topic) - - if topic.length > max_project_topic_length - %a{ class: "#{ project_topics_classes } str-truncated-30 has-tooltip", data: { container: "body" }, title: topic, href: explore_project_topic_path, itemprop: 'keywords' } - = topic.titleize - - else - %a{ class: project_topics_classes, href: explore_project_topic_path, itemprop: 'keywords' } - = topic.titleize - - - if @project.has_extra_topics? - .text-nowrap.has-tooltip{ data: { container: 'body' }, title: @project.has_extra_topics? ? @project.topics_not_shown.join(', ') : nil } - = _("+ %{count} more") % { count: @project.count_of_extra_topics_not_shown } + .gl-mt-3.gl-pl-3.gl-w-full + = render "shared/projects/topics", project: @project, cache_enabled: cache_enabled = cache_if(cache_enabled, [@project, :buttons, current_user, @notification_setting], expires_in: 1.day) do .project-repo-buttons.gl-display-flex.gl-justify-content-md-end.gl-align-items-start.gl-flex-wrap.gl-mt-5 @@ -88,12 +71,11 @@ = render_if_exists "projects/home_mirror" - if @project.badges.present? - = cache_if(cache_enabled, [@project, :badges], expires_in: 1.day) do - .project-badges.mb-2 - - @project.badges.each do |badge| - %a.gl-mr-3{ href: badge.rendered_link_url(@project), - target: '_blank', - rel: 'noopener noreferrer' }> - %img.project-badge{ src: badge.rendered_image_url(@project), - 'aria-hidden': true, - alt: 'Project badge' }> + .project-badges.mb-2 + - @project.badges.each do |badge| + %a.gl-mr-3{ href: badge.rendered_link_url(@project), + target: '_blank', + rel: 'noopener noreferrer' }> + %img.project-badge{ src: badge.rendered_image_url(@project), + 'aria-hidden': true, + alt: 'Project badge' }> diff --git a/app/views/projects/_invite_members_modal.html.haml b/app/views/projects/_invite_members_modal.html.haml index 5dd6ec0addf..6375a56bf5d 100644 --- a/app/views/projects/_invite_members_modal.html.haml +++ b/app/views/projects/_invite_members_modal.html.haml @@ -1,8 +1,5 @@ -- return unless can_import_members? +- return unless can_admin_project_member?(project) -.js-invite-members-modal{ data: { id: project.id, - name: project.name, - is_project: 'true', +.js-invite-members-modal{ data: { is_project: 'true', access_levels: ProjectMember.access_level_roles.to_json, - default_access_level: Gitlab::Access::GUEST, - help_link: help_page_url('user/permissions') } } + help_link: help_page_url('user/permissions') }.merge(common_invite_modal_dataset(project)).merge(users_filter_data(project.group)) } diff --git a/app/views/projects/_last_push.html.haml b/app/views/projects/_last_push.html.haml index afe42b334ba..9ba7d25b662 100644 --- a/app/views/projects/_last_push.html.haml +++ b/app/views/projects/_last_push.html.haml @@ -1,19 +1,21 @@ - event = last_push_event - if event && show_last_push_widget?(event) - .row-content-block.top-block.d-none.d-sm-block.white - .event-last-push - .event-last-push-text - %span= s_("LastPushEvent|You pushed to") - %strong - = link_to event.ref_name, project_commits_path(event.project, event.ref_name), class: 'ref-name' + .gl-alert.gl-alert-success.mt-2{ role: 'alert' } + = sprite_icon('check-circle', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') + %button.js-close-banner.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') } + = sprite_icon('close', size: 16, css_class: 'gl-icon') + .gl-alert-body + %span= s_("LastPushEvent|You pushed to") + %strong.gl-display-inline-flex.gl-max-w-50p{ data: { toggle: 'tooltip' }, title: event.ref_name } + = link_to event.ref_name, project_commits_path(event.project, event.ref_name), class: 'ref-name gl-text-truncate' - - if event.project != @project - %span= s_("LastPushEvent|at") - %strong= link_to_project event.project + - if event.project != @project + %span= s_("LastPushEvent|at") + %strong= link_to_project event.project - #{time_ago_with_tooltip(event.created_at)} + #{time_ago_with_tooltip(event.created_at)} - - if can?(current_user, :create_merge_request_in, event.project.default_merge_request_target) - .flex-right - = link_to new_mr_path_from_push_event(event), title: _("New merge request"), class: "btn gl-button btn-info btn-sm qa-create-merge-request" do - #{ _('Create merge request') } + - if can?(current_user, :create_merge_request_in, event.project.default_merge_request_target) + .gl-alert-actions + = link_to new_mr_path_from_push_event(event), title: _("New merge request"), class: "btn gl-button btn-confirm qa-create-merge-request" do + #{ _('Create merge request') } diff --git a/app/views/projects/_new_project_fields.html.haml b/app/views/projects/_new_project_fields.html.haml index 55696337bc1..026c7a0d79d 100644 --- a/app/views/projects/_new_project_fields.html.haml +++ b/app/views/projects/_new_project_fields.html.haml @@ -54,8 +54,7 @@ .form-group.row.initialize-with-readme-setting %div{ :class => "col-sm-12" } .form-check - - experiment(:new_project_readme, actor: current_user) do |e| - = check_box_tag 'project[initialize_with_readme]', '1', e.run, class: 'form-check-input', data: { qa_selector: "initialize_with_readme_checkbox", track_label: "#{track_label}", track_event: "activate_form_input", track_property: "init_with_readme", track_value: "" } + = check_box_tag 'project[initialize_with_readme]', '1', true, class: 'form-check-input', data: { qa_selector: "initialize_with_readme_checkbox", track_label: "#{track_label}", track_event: "activate_form_input", track_property: "init_with_readme", track_value: "" } = label_tag 'project[initialize_with_readme]', class: 'form-check-label' do .option-title %strong= s_('ProjectsNew|Initialize repository with a README') diff --git a/app/views/projects/_terraform_banner.html.haml b/app/views/projects/_terraform_banner.html.haml index a30c4a2d624..881e4ccd9df 100644 --- a/app/views/projects/_terraform_banner.html.haml +++ b/app/views/projects/_terraform_banner.html.haml @@ -2,4 +2,4 @@ - if show_terraform_banner?(project) .container-fluid{ class: @content_class } - .js-terraform-notification{ data: { project_id: project.id } } + .js-terraform-notification{ data: { terraform_image_path: image_path('illustrations/third-party-logos/ci_cd-template-logos/terraform.svg') } } diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml index 8fe9c9e5c52..30c052e054f 100644 --- a/app/views/projects/blame/show.html.haml +++ b/app/views/projects/blame/show.html.haml @@ -51,7 +51,7 @@ = i \ - %td.lines + %td.lines.gl-w-full %pre.code.highlight %code - blame_group[:lines].each do |line| diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index f2f753b4e86..41333c416de 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -5,7 +5,7 @@ .file-holder-bottom-radius.file-holder.file.gl-mb-3 .js-file-title.file-title.gl-display-flex.gl-align-items-center.clearfix{ data: { current_action: action } } .editor-ref.block-truncated.has-tooltip{ title: ref } - = sprite_icon('fork', size: 12) + = sprite_icon('branch', size: 12) = ref - if current_action?(:edit) || current_action?(:update) %span.float-left.gl-mr-3 diff --git a/app/views/projects/blob/viewers/_gitlab_ci_yml.html.haml b/app/views/projects/blob/viewers/_gitlab_ci_yml.html.haml index d8d27c3330b..afde59aa37d 100644 --- a/app/views/projects/blob/viewers/_gitlab_ci_yml.html.haml +++ b/app/views/projects/blob/viewers/_gitlab_ci_yml.html.haml @@ -6,4 +6,4 @@ = s_('Pipelines|This GitLab CI configuration is invalid:') = viewer.validation_message(project: @project, sha: @commit.sha, user: @current_user) -= link_to _('Learn more'), help_page_path('ci/yaml/README') += link_to _('Learn more'), help_page_path('ci/yaml/index') diff --git a/app/views/projects/blob/viewers/_gitlab_ci_yml_loading.html.haml b/app/views/projects/blob/viewers/_gitlab_ci_yml_loading.html.haml index b1c8e110493..cf57f1b531d 100644 --- a/app/views/projects/blob/viewers/_gitlab_ci_yml_loading.html.haml +++ b/app/views/projects/blob/viewers/_gitlab_ci_yml_loading.html.haml @@ -1,4 +1,4 @@ = loading_icon(css_class: "gl-vertical-align-text-bottom mr-1") = s_('Pipelines|Validating GitLab CI configuration…') -= link_to _('Learn more'), help_page_path('ci/yaml/README') += link_to _('Learn more'), help_page_path('ci/yaml/index') diff --git a/app/views/projects/blob/viewers/_route_map.html.haml b/app/views/projects/blob/viewers/_route_map.html.haml index 068cf400cd5..30182c100d5 100644 --- a/app/views/projects/blob/viewers/_route_map.html.haml +++ b/app/views/projects/blob/viewers/_route_map.html.haml @@ -6,4 +6,4 @@ This Route Map is invalid: = viewer.validation_message -= link_to 'Learn more', help_page_path('ci/environments/index.md', anchor: 'going-from-source-files-to-public-pages') += link_to 'Learn more', help_page_path('ci/environments/index.md', anchor: 'go-from-source-files-to-public-pages') diff --git a/app/views/projects/blob/viewers/_route_map_loading.html.haml b/app/views/projects/blob/viewers/_route_map_loading.html.haml index 8610847fbc9..c48ab84654f 100644 --- a/app/views/projects/blob/viewers/_route_map_loading.html.haml +++ b/app/views/projects/blob/viewers/_route_map_loading.html.haml @@ -1,4 +1,4 @@ = loading_icon(css_class: "gl-vertical-align-text-bottom gl-mr-1") Validating Route Map… -= link_to 'Learn more', help_page_path('ci/environments/index.md', anchor: 'going-from-source-files-to-public-pages') += link_to 'Learn more', help_page_path('ci/environments/index.md', anchor: 'go-from-source-files-to-public-pages') diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index 60cb06f71ba..99a9535b8e8 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -4,7 +4,7 @@ %li{ class: "branch-item js-branch-item js-branch-#{branch.name}", data: { name: branch.name } } .branch-info .branch-title - = sprite_icon('fork', size: 12, css_class: 'gl-flex-shrink-0') + = sprite_icon('branch', size: 12, css_class: 'gl-flex-shrink-0') = link_to project_tree_path(@project, branch.name), class: 'item-title str-truncated-100 ref-name gl-ml-3 qa-branch-name' do = branch.name - if branch.name == @repository.root_ref diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index 824e876500b..1a3813ba99f 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -12,12 +12,15 @@ %td.status = render "ci/status/badge", status: job.detailed_status(current_user), title: job.status_title - %td.branch-commit.cgray + %td - if can?(current_user, :read_build, job) - = link_to project_job_path(job.project, job) do - %span.build-link ##{job.id} + = link_to job.name, project_job_path(job.project, job), class: 'gl-text-blue-600!' - else - %span.build-link ##{job.id} + %span.gl-text-blue-600! + = job.name + + %td.branch-commit.gl-text-gray-900 + %span.build-link ##{job.id} - if ref - if job.ref @@ -79,9 +82,6 @@ = job.stage %td - = job.name - - %td - if job.duration %p.duration = custom_icon("icon_timer") @@ -105,7 +105,7 @@ - if can?(current_user, :update_build, job) - if job.active? = link_to cancel_project_job_path(job.project, job, continue: { to: request.fullpath }), method: :post, title: _('Cancel'), class: 'gl-button btn btn-default btn-icon' do - = sprite_icon('close', css_class: 'gl-icon') + = sprite_icon('cancel', css_class: 'gl-icon') - elsif job.scheduled? .gl-button.btn.btn-default.btn-icon.disabled{ disabled: true } = sprite_icon('planning', css_class: 'gl-icon') diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index 67007aa7448..36d3520cb59 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -57,7 +57,7 @@ #{ n_(s_('Pipeline|with stage'), s_('Pipeline|with stages'), @last_pipeline.stages_count) } .mr-widget-pipeline-graph .stage-cell - .js-commit-pipeline-mini-graph{ data: { stages: @last_pipeline_stages.to_json.html_safe } } + .js-commit-pipeline-mini-graph{ data: { stages: @last_pipeline_stages.to_json.html_safe, full_path: @project.full_path, iid: @last_pipeline.iid } } - if @last_pipeline.duration in = time_interval_in_words @last_pipeline.duration diff --git a/app/views/projects/commit/show.html.haml b/app/views/projects/commit/show.html.haml index c3fdfeb6f4e..e22d33e3c72 100644 --- a/app/views/projects/commit/show.html.haml +++ b/app/views/projects/commit/show.html.haml @@ -9,7 +9,7 @@ - page_description @commit.description - add_page_specific_style 'page_bundles/pipelines' -.container-fluid{ class: [limited_container_width, container_class] } +.container-fluid.commits-container{ class: [limited_container_width, container_class] } = render "commit_box" = render "ci_menu" = render "projects/diffs/diffs", diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml index 463984a13a2..22a5bada311 100644 --- a/app/views/projects/commits/show.html.haml +++ b/app/views/projects/commits/show.html.haml @@ -26,7 +26,7 @@ = form_tag(project_commits_path(@project, @id), method: :get, class: 'commits-search-form js-signature-container', data: { 'signatures-path' => namespace_project_signatures_path }) do = search_field_tag :search, params[:search], { placeholder: _('Search by message'), id: 'commits-search', class: 'form-control gl-form-input input-short gl-mt-3 gl-sm-mt-0 gl-min-w-full', spellcheck: false } .control.d-none.d-md-block - = link_to project_commits_path(@project, @ref, rss_url_options), title: _("Commits feed"), class: 'btn gl-button btn-default btn-icon' do + = link_to project_commits_path(@project, @id, rss_url_options), title: _("Commits feed"), class: 'btn gl-button btn-default btn-icon' do = sprite_icon('rss', css_class: 'qa-rss-icon') = render_if_exists 'projects/commits/mirror_status' diff --git a/app/views/projects/deployments/_confirm_rollback_modal.html.haml b/app/views/projects/deployments/_confirm_rollback_modal.html.haml deleted file mode 100644 index 23729d6ebf9..00000000000 --- a/app/views/projects/deployments/_confirm_rollback_modal.html.haml +++ /dev/null @@ -1,23 +0,0 @@ -- commit_sha = link_to deployment.short_sha, project_commit_path(@project, deployment.sha), class: "commit-sha has-tooltip", title: h(deployment.commit_title) -.modal.ws-normal.fade{ tabindex: -1, id: "confirm-rollback-modal-#{deployment.id}" } - .modal-dialog - .modal-content - .modal-header - %h4.modal-title.d-flex.mw-100 - - if deployment.last? - = s_("Environments|Re-deploy environment %{environment_name}?") % {environment_name: @environment.name} - - else - = s_("Environments|Rollback environment %{environment_name}?") % {environment_name: @environment.name} - .modal-body - - if deployment.last? - %p= s_('Environments|This action will relaunch the job for commit %{commit_id}, putting the environment in a previous version. Are you sure you want to continue?').html_safe % {commit_id: commit_sha} - - else - %p - = s_('Environments|This action will run the job defined by %{environment_name} for commit %{commit_id}, putting the environment in a previous version. You can revert it by re-deploying the latest version of your application. Are you sure you want to continue?').html_safe % {commit_id: commit_sha, environment_name: @environment.name} - .modal-footer - = button_tag _('Cancel'), type: 'button', class: 'btn gl-button btn-danger', data: { dismiss: 'modal' } - = link_to [:retry, @project, deployment.deployable], method: :post, class: 'btn gl-button btn-danger' do - - if deployment.last? - = s_('Environments|Re-deploy') - - else - = s_('Environments|Rollback') diff --git a/app/views/projects/deployments/_rollback.haml b/app/views/projects/deployments/_rollback.haml index 78972a5b7b9..a7befabdc96 100644 --- a/app/views/projects/deployments/_rollback.haml +++ b/app/views/projects/deployments/_rollback.haml @@ -1,8 +1,7 @@ - if deployment.deployable && can?(current_user, :create_deployment, deployment) - tooltip = deployment.last? ? s_('Environments|Re-deploy to environment') : s_('Environments|Rollback environment') - = button_tag class: 'gl-button btn btn-default btn-icon has-tooltip', type: 'button', data: { toggle: 'modal', target: "#confirm-rollback-modal-#{deployment.id}" }, title: tooltip do + = button_tag class: 'js-confirm-rollback-modal-button gl-button btn btn-default btn-icon has-tooltip', type: 'button', data: { environment_name: @environment.name, commit_short_sha: deployment.short_sha, commit_url: project_commit_path(@project, deployment.sha), is_last_deployment: deployment.last?.to_s, retry_path: retry_project_job_path(@environment.project, deployment.deployable) }, title: tooltip do - if deployment.last? = sprite_icon('repeat', css_class: 'gl-icon') - else = sprite_icon('redo', css_class: 'gl-icon') - = render 'projects/deployments/confirm_rollback_modal', deployment: deployment diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml index 35e2fe1b398..418a65118f5 100644 --- a/app/views/projects/diffs/_file.html.haml +++ b/app/views/projects/diffs/_file.html.haml @@ -16,7 +16,7 @@ - unless diff_file.submodule? .file-actions.gl-display-none.gl-sm-display-flex - if diff_file.blob&.readable_text? - %span.has-tooltip.gl-mr-3{ title: _("Toggle comments for this file") } + %span.has-tooltip{ title: _("Toggle comments for this file") } = link_to '#', class: 'js-toggle-diff-comments btn gl-button btn-default btn-icon selected', disabled: @diff_notes_disabled do = sprite_icon('comment') \ diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 187fe608a68..926a0610577 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -19,7 +19,7 @@ .settings-content = form_for @project, html: { multipart: true, class: "sharing-permissions-form" }, authenticity_token: true do |f| %input{ name: 'update_section', type: 'hidden', value: 'js-shared-permissions' } - %template.js-project-permissions-form-data{ type: "application/json" }= project_permissions_panel_data_json(@project) + %template.js-project-permissions-form-data{ type: "application/json" }= project_permissions_panel_data(@project).to_json.html_safe .js-project-permissions-form - if show_visibility_confirm_modal?(@project) = render "visibility_modal" @@ -54,6 +54,8 @@ .settings-content = render 'shared/badges/badge_settings' += render_if_exists 'compliance_management/compliance_framework/project_settings', expanded: expanded + = render_if_exists 'projects/settings/default_issue_template' = render 'projects/service_desk_settings' diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml index 70d86e79282..905794c0730 100644 --- a/app/views/projects/empty.html.haml +++ b/app/views/projects/empty.html.haml @@ -7,7 +7,7 @@ = render "home_panel" = render "archived_notice", project: @project -= render 'invite_members_empty_project' if can_import_members? += render "invite_members_empty_project" if can_admin_project_member?(@project) %h4.gl-mt-0.gl-mb-3 = _('The repository for this project is empty') diff --git a/app/views/projects/environments/_external_url.html.haml b/app/views/projects/environments/_external_url.html.haml deleted file mode 100644 index b9208969fb3..00000000000 --- a/app/views/projects/environments/_external_url.html.haml +++ /dev/null @@ -1,4 +0,0 @@ -- if environment.external_url && can?(current_user, :read_environment, environment) - = link_to environment.external_url, target: '_blank', rel: 'noopener noreferrer', class: 'gl-button btn external-url has-tooltip qa-view-deployment', title: s_('Environments|Open live environment') do - = sprite_icon('external-link') - = _("View deployment") diff --git a/app/views/projects/environments/_form.html.haml b/app/views/projects/environments/_form.html.haml deleted file mode 100644 index a295c8f6fb0..00000000000 --- a/app/views/projects/environments/_form.html.haml +++ /dev/null @@ -1,21 +0,0 @@ -.row.gl-mt-3.gl-mb-3 - .col-lg-3 - %h4.gl-mt-0 - = _("Environments") - %p - - link_to_read_more = link_to(_("More information"), help_page_path("ci/environments/index.md")) - = _("Environments allow you to track deployments of your application %{link_to_read_more}.").html_safe % { link_to_read_more: link_to_read_more } - - = form_for [@project, @environment], html: { class: 'col-lg-9' } do |f| - = form_errors(@environment) - - .form-group - = f.label :name, _('Name'), class: 'label-bold' - = f.text_field :name, required: true, class: 'form-control' - .form-group - = f.label :external_url, _('External URL'), class: 'label-bold' - = f.url_field :external_url, class: 'form-control' - - .form-actions - = f.submit _('Save'), class: 'gl-button btn btn-confirm' - = link_to _('Cancel'), project_environments_path(@project), class: 'gl-button btn btn-cancel' diff --git a/app/views/projects/environments/_metrics_button.html.haml b/app/views/projects/environments/_metrics_button.html.haml deleted file mode 100644 index 65abaf44082..00000000000 --- a/app/views/projects/environments/_metrics_button.html.haml +++ /dev/null @@ -1,7 +0,0 @@ -- environment = local_assigns.fetch(:environment) - -- return unless can?(current_user, :read_environment, environment) - -= link_to environment_metrics_path(environment), title: _('See metrics'), class: 'gl-button btn metrics-button' do - = sprite_icon('chart', css_class: 'gl-mr-2') - = _("Monitoring") diff --git a/app/views/projects/environments/_pin_button.html.haml b/app/views/projects/environments/_pin_button.html.haml deleted file mode 100644 index ec3e7e20365..00000000000 --- a/app/views/projects/environments/_pin_button.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -- if environment.auto_stop_at? && environment.available? - = button_to cancel_auto_stop_project_environment_path(environment.project, environment), class: 'gl-button btn btn-secondary has-tooltip', title: _('Prevent environment from auto-stopping') do - = sprite_icon('thumbtack') diff --git a/app/views/projects/environments/_terminal_button.html.haml b/app/views/projects/environments/_terminal_button.html.haml deleted file mode 100644 index ab3363bbb07..00000000000 --- a/app/views/projects/environments/_terminal_button.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -- if environment.has_terminals? && can?(current_user, :admin_environment, @project) - = link_to terminal_project_environment_path(@project, environment), class: 'gl-button btn terminal-button' do - = sprite_icon('terminal') diff --git a/app/views/projects/environments/edit.html.haml b/app/views/projects/environments/edit.html.haml index c4e2c1eb63d..dcd5fb2574e 100644 --- a/app/views/projects/environments/edit.html.haml +++ b/app/views/projects/environments/edit.html.haml @@ -1,7 +1,6 @@ - page_title _("Edit"), @environment.name, _("Environments") - add_page_specific_style 'page_bundles/environments' -%h3.page-title - = _('Edit environment') -%hr -= render 'form' +#js-edit-environment{ data: { project_environments_path: project_environments_path(@project), + update_environment_path: project_environment_path(@project, @environment), + environment: environment_data(@environment)} } diff --git a/app/views/projects/environments/new.html.haml b/app/views/projects/environments/new.html.haml index 6b0ccc1dcc7..de7f976717b 100644 --- a/app/views/projects/environments/new.html.haml +++ b/app/views/projects/environments/new.html.haml @@ -2,7 +2,4 @@ - page_title _("New Environment") - add_page_specific_style 'page_bundles/environments' -%h3.page-title - = _("New environment") -%hr -= render 'form' +#js-new-environment{ data: { project_environments_path: project_environments_path(@project) } } diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml index b3e4b7a4998..b123b81b89c 100644 --- a/app/views/projects/environments/show.html.haml +++ b/app/views/projects/environments/show.html.haml @@ -5,58 +5,8 @@ - add_page_specific_style 'page_bundles/environments' - add_page_specific_style 'page_bundles/ci_status' -#environments-detail-view{ data: { name: @environment.name, id: @environment.id, delete_path: environment_delete_path(@environment)} } - - if @environment.available? && can?(current_user, :stop_environment, @environment) - #stop-environment-modal.modal.fade{ tabindex: -1 } - .modal-dialog - .modal-content - .modal-header - %h4.modal-title.d-flex.mw-100 - = s_("Environments|Stopping") - %span.has-tooltip.text-truncate.ml-1.mr-1.flex-fill{ title: @environment.name, data: { container: '#stop-environment-modal' } } - #{@environment.name}? - .modal-body - %p= s_('Environments|Are you sure you want to stop this environment?') - - unless @environment.stop_action_available? - .warning_message - %p= s_('Environments|Note that this action will stop the environment, but it will %{emphasis_start}not%{emphasis_end} have an effect on any existing deployment due to no “stop environment action” being defined in the %{ci_config_link_start}.gitlab-ci.yml%{ci_config_link_end} file.').html_safe % { emphasis_start: '<strong>'.html_safe, - emphasis_end: '</strong>'.html_safe, - ci_config_link_start: '<a href="https://docs.gitlab.com/ee/ci/yaml/" target="_blank" rel="noopener noreferrer">'.html_safe, - ci_config_link_end: '</a>'.html_safe } - %a{ href: 'https://docs.gitlab.com/ee/ci/environments/index.html#stopping-an-environment', - target: '_blank', - rel: 'noopener noreferrer' } - = s_('Environments|Learn more about stopping environments') - .modal-footer - = button_tag _('Cancel'), type: 'button', class: 'gl-button btn btn-cancel', data: { dismiss: 'modal' } - = button_to stop_project_environment_path(@project, @environment), class: 'gl-button btn btn-danger has-tooltip', method: :post do - = s_('Environments|Stop environment') - - - if can_destroy_environment?(@environment) - #delete-environment-modal - - .top-area.justify-content-between - .d-flex - %h3.page-title= @environment.name - - if @environment.auto_stop_at? - %p.align-self-end.gl-ml-3 - = s_('Environments|Auto stops %{auto_stop_time}').html_safe % {auto_stop_time: time_ago_with_tooltip(@environment.auto_stop_at)} - .nav-controls.my-2 - = render 'projects/environments/pin_button', environment: @environment - = render 'projects/environments/terminal_button', environment: @environment - = render 'projects/environments/external_url', environment: @environment - = render 'projects/environments/metrics_button', environment: @environment - - if can?(current_user, :update_environment, @environment) - = link_to _('Edit'), edit_project_environment_path(@project, @environment), class: 'btn' - - if @environment.available? && can?(current_user, :stop_environment, @environment) - = button_tag class: 'gl-button btn btn-danger', type: 'button', data: { toggle: 'modal', - target: '#stop-environment-modal' } do - = sprite_icon('stop') - = s_('Environments|Stop') - - if can_destroy_environment?(@environment) - = button_tag class: 'gl-button btn btn-danger', type: 'button', data: { toggle: 'modal', - target: '#delete-environment-modal' } do - = s_('Environments|Delete') +#environments-detail-view{ data: { details: environments_detail_data_json(current_user, @project, @environment) } } + #environments-detail-view-header .environments-container - if @deployments.blank? diff --git a/app/views/projects/feature_flags/edit.html.haml b/app/views/projects/feature_flags/edit.html.haml index f71c97c2a8f..c1c9f58265d 100644 --- a/app/views/projects/feature_flags/edit.html.haml +++ b/app/views/projects/feature_flags/edit.html.haml @@ -9,5 +9,5 @@ feature_flags_path: project_feature_flags_path(@project), environments_endpoint: search_project_environments_path(@project, format: :json), strategy_type_docs_page_path: help_page_path('operations/feature_flags', anchor: 'feature-flag-strategies'), - environments_scope_docs_path: help_page_path('ci/environments/index.md', anchor: 'scoping-environments-with-specs'), + environments_scope_docs_path: help_page_path('ci/environments/index.md', anchor: 'scope-environments-with-specs'), feature_flag_issues_endpoint: feature_flag_issues_links_endpoint(@project, @feature_flag, current_user) } } diff --git a/app/views/projects/feature_flags/new.html.haml b/app/views/projects/feature_flags/new.html.haml index bc52f52ecf7..097475d2928 100644 --- a/app/views/projects/feature_flags/new.html.haml +++ b/app/views/projects/feature_flags/new.html.haml @@ -10,5 +10,5 @@ user_callout_id: UserCalloutsHelper::FEATURE_FLAGS_NEW_VERSION, show_user_callout: show_feature_flags_new_version?.to_s, strategy_type_docs_page_path: help_page_path('operations/feature_flags', anchor: 'feature-flag-strategies'), - environments_scope_docs_path: help_page_path('ci/environments/index.md', anchor: 'scoping-environments-with-specs'), + environments_scope_docs_path: help_page_path('ci/environments/index.md', anchor: 'scope-environments-with-specs'), project_id: @project.id } } diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml index 9c01d93f7d0..ee3aaee6dbb 100644 --- a/app/views/projects/issues/_issue.html.haml +++ b/app/views/projects/issues/_issue.html.haml @@ -12,6 +12,9 @@ - if issue.confidential? %span.has-tooltip{ title: _('Confidential') } = confidential_icon(issue) + - if Feature.enabled?(:ban_user_feature_flag) && issue.hidden? + %span.has-tooltip{ title: _('This issue is hidden because its author has been banned') } + = hidden_issue_icon(issue) = link_to issue.title, issue_path(issue) = render_if_exists 'projects/issues/subepic_flag', issue: issue - if issue.tasks? @@ -36,7 +39,7 @@ = sprite_icon('clock', css_class: 'gl-vertical-align-text-bottom') = issue.milestone.title - if issue.due_date - %span.issuable-due-date.d-none.d-sm-inline-block.has-tooltip{ class: "#{'cred' if issue.overdue?}", title: _('Due date') } + %span.issuable-due-date.d-none.d-sm-inline-block.has-tooltip{ class: "#{'cred' if issue.overdue? && !issue.closed?}", title: _('Due date') } = sprite_icon('calendar') = issue.due_date.to_s(:medium) diff --git a/app/views/projects/issues/captcha_check.html.haml b/app/views/projects/issues/captcha_check.html.haml new file mode 100644 index 00000000000..657c5c2cd8f --- /dev/null +++ b/app/views/projects/issues/captcha_check.html.haml @@ -0,0 +1,7 @@ += render layout: 'shared/captcha_check', locals: { spammable: @issue } do + -# These fields are for values which are passed via URL parameters, and not included in the + -# issue's params, so they must be yielded to the block to be rendered. + -# If these are removed and no longer passed via URL parameters, the support + -# for yielding in the layout can also be removed. + = hidden_field_tag(:merge_request_to_resolve_discussions_of, params[:merge_request_to_resolve_discussions_of]) + = hidden_field_tag(:discussion_to_resolve, params[:discussion_to_resolve]) diff --git a/app/views/projects/issues/verify.html.haml b/app/views/projects/issues/verify.html.haml deleted file mode 100644 index 935a3493a37..00000000000 --- a/app/views/projects/issues/verify.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -= render layout: 'layouts/recaptcha_verification', locals: { spammable: @issue } do - = hidden_field_tag(:merge_request_to_resolve_discussions_of, params[:merge_request_to_resolve_discussions_of]) - = hidden_field_tag(:discussion_to_resolve, params[:discussion_to_resolve]) diff --git a/app/views/projects/jobs/_table.html.haml b/app/views/projects/jobs/_table.html.haml index 2d8b7315a29..cd59eae1fb7 100644 --- a/app/views/projects/jobs/_table.html.haml +++ b/app/views/projects/jobs/_table.html.haml @@ -21,13 +21,13 @@ %thead %tr %th Status + %th Name %th Job %th Pipeline - if admin %th Project %th Runner %th Stage - %th Name %th Duration %th Coverage %th diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index b70bc740175..3e2c5f088f7 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -33,7 +33,7 @@ %span.project-ref-path.has-tooltip{ title: _('Target branch') } = link_to project_ref_path(merge_request.project, merge_request.target_branch), class: 'ref-name' do - = sprite_icon('fork', size: 12, css_class: 'fork-sprite') + = sprite_icon('branch', size: 12, css_class: 'fork-sprite') = merge_request.target_branch - if merge_request.labels.any? diff --git a/app/views/projects/merge_requests/creations/_new_submit.html.haml b/app/views/projects/merge_requests/creations/_new_submit.html.haml index 7e1ca19d9b6..4aca13ae74a 100644 --- a/app/views/projects/merge_requests/creations/_new_submit.html.haml +++ b/app/views/projects/merge_requests/creations/_new_submit.html.haml @@ -40,7 +40,7 @@ #diff-notes-app.tab-content #new.commits.tab-pane.active = render "projects/merge_requests/commits" - #diffs.diffs.tab-pane + #diffs.diffs.tab-pane{ class: "gl-m-0!" } -# This tab is always loaded via AJAX - if @pipelines.any? #pipelines.pipelines.tab-pane diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml index c4ee522bfa7..6d1ba9e693b 100644 --- a/app/views/projects/merge_requests/show.html.haml +++ b/app/views/projects/merge_requests/show.html.haml @@ -97,4 +97,5 @@ #js-review-bar = render 'projects/invite_members_modal', project: @project - +- if Gitlab::CurrentSettings.gitpod_enabled && !current_user&.gitpod_enabled + = render 'shared/gitpod/enable_gitpod_modal' diff --git a/app/views/projects/mirrors/_mirror_repos.html.haml b/app/views/projects/mirrors/_mirror_repos.html.haml index 5a1e263141d..b89aa9d402e 100644 --- a/app/views/projects/mirrors/_mirror_repos.html.haml +++ b/app/views/projects/mirrors/_mirror_repos.html.haml @@ -70,10 +70,10 @@ = render 'projects/mirrors/disabled_mirror_badge' - if mirror.last_error.present? .badge.mirror-error-badge{ data: { toggle: 'tooltip', html: 'true', qa_selector: 'mirror_error_badge' }, title: html_escape(mirror.last_error.try(:strip)) }= _('Error') - %td + %td.gl-display-flex - if mirror_settings_enabled - .btn-group.mirror-actions-group.float-right{ role: 'group' } + %button.js-delete-mirror.qa-delete-mirror.rspec-delete-mirror.btn.btn-icon.gl-button.btn-danger.gl-mr-3{ type: 'button', data: { mirror_id: mirror.id, toggle: 'tooltip', container: 'body' }, title: _('Remove') }= sprite_icon('remove') + .btn-group.mirror-actions-group{ role: 'group' } - if mirror.ssh_key_auth? = clipboard_button(text: mirror.ssh_public_key, class: 'gl-button btn btn-default', title: _('Copy SSH public key'), qa_selector: 'copy_public_key_button') = render 'shared/remote_mirror_update_button', remote_mirror: mirror - %button.js-delete-mirror.qa-delete-mirror.rspec-delete-mirror.btn.btn-icon.gl-button.btn-danger{ type: 'button', data: { mirror_id: mirror.id, toggle: 'tooltip', container: 'body' }, title: _('Remove') }= sprite_icon('remove') diff --git a/app/views/projects/mirrors/_mirror_repos_push.html.haml b/app/views/projects/mirrors/_mirror_repos_push.html.haml index 04f44f4748e..b3e0f71bf19 100644 --- a/app/views/projects/mirrors/_mirror_repos_push.html.haml +++ b/app/views/projects/mirrors/_mirror_repos_push.html.haml @@ -11,5 +11,5 @@ = check_box_tag :keep_divergent_refs, '1', false, class: 'js-mirror-keep-divergent-refs form-check-input' = label_tag :keep_divergent_refs, _('Keep divergent refs'), class: 'form-check-label' .form-text.text-muted - = _('By default, if any ref (branch, tag, or commit) on the remote mirror has diverged from the local repository, the entire push will fail, and nothing will be updated. Choose this option to override this behavior. After the mirror is created, this can only be modified via the API.') - = link_to _('Learn more.'), help_page_path('user/project/repository/repository_mirroring', anchor: 'keep-divergent-refs'), target: '_blank', rel: 'noopener noreferrer' + - link_opening_tag = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe + = html_escape(_('Do not force push over diverged refs. After the mirror is created, this setting can only be modified using the API. %{mirroring_docs_link_start}Learn more about this option%{link_closing_tag} and %{mirroring_api_docs_link_start}the API.%{link_closing_tag}')) % { mirroring_docs_link_start: link_opening_tag % {url: help_page_path('user/project/repository/repository_mirroring', anchor: 'keep-divergent-refs')}, mirroring_api_docs_link_start: link_opening_tag % {url: help_page_path('api/remote_mirrors')}, link_closing_tag: '</a>'.html_safe } diff --git a/app/views/projects/packages/packages/show.html.haml b/app/views/projects/packages/packages/show.html.haml index 76eb22109a4..42c31b3272f 100644 --- a/app/views/projects/packages/packages/show.html.haml +++ b/app/views/projects/packages/packages/show.html.haml @@ -6,7 +6,7 @@ .row .col-12 - - if Feature.enabled?(:package_details_apollo) - #js-vue-packages-detail-new{ data: package_details_data(@project) } + - if Feature.enabled?(:package_details_apollo, default_enabled: :yaml) + #js-vue-packages-detail-new{ data: package_details_data(@project, @package) } - else - #js-vue-packages-detail{ data: package_details_data(@project, @package) } + #js-vue-packages-detail{ data: package_details_data(@project, @package, true) } diff --git a/app/views/projects/pipelines/show.html.haml b/app/views/projects/pipelines/show.html.haml index 1c134d914e9..30ebe4f20b6 100644 --- a/app/views/projects/pipelines/show.html.haml +++ b/app/views/projects/pipelines/show.html.haml @@ -5,9 +5,7 @@ - add_page_specific_style 'page_bundles/pipeline' - add_page_specific_style 'page_bundles/reports' - add_page_specific_style 'page_bundles/ci_status' - -- if Feature.enabled?(:graphql_pipeline_details, @project, default_enabled: :yaml) || Feature.enabled?(:graphql_pipeline_details_users, @current_user, default_enabled: :yaml) - - add_page_startup_graphql_call('pipelines/get_pipeline_details', { projectPath: @project.full_path, iid: @pipeline.iid }) +- add_page_startup_graphql_call('pipelines/get_pipeline_details', { projectPath: @project.full_path, iid: @pipeline.iid }) .js-pipeline-container{ data: { controller_action: "#{controller.action_name}" } } #js-pipeline-header-vue.pipeline-header-container{ data: { full_path: @project.full_path, pipeline_iid: @pipeline.iid, pipeline_id: @pipeline.id, pipelines_path: project_pipelines_path(@project) } } diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml index d1b6db95392..0239e408e87 100644 --- a/app/views/projects/project_members/index.html.haml +++ b/app/views/projects/project_members/index.html.haml @@ -1,7 +1,6 @@ - add_page_specific_style 'page_bundles/members' - page_title _("Members") -.js-remove-member-modal .row.gl-mt-3 .col-lg-12 - if can_invite_members_for_project?(@project) || can_invite_group_for_project?(@project) @@ -11,21 +10,21 @@ %h4 = _("Project members") .gl-justify-content-bottom.gl-display-flex.align-items-center - - if can_manage_project_members?(@project) + - if can?(current_user, :admin_project_member, @project) %p= share_project_description(@project) - else %p = html_escape(_("Members can be added by project %{i_open}Maintainers%{i_close} or %{i_open}Owners%{i_close}")) % { i_open: '<i>'.html_safe, i_close: '</i>'.html_safe } .col-md-12.col-lg-6 .gl-display-flex.gl-flex-wrap.gl-justify-content-end - - if can_import_members? + - if can_admin_project_member?(@project) = link_to _("Import a project"), import_project_project_members_path(@project), class: "btn btn-default btn-md gl-button gl-mt-3 gl-sm-w-auto gl-w-full", title: _("Import members from another project") - if @project.allowed_to_share_with_group? .js-invite-group-trigger{ data: { classes: 'gl-mt-3 gl-sm-w-auto gl-w-full gl-sm-ml-3', display_text: _('Invite a group') } } - - if can_manage_project_members?(@project) && !membership_locked? + - if can_admin_project_member?(@project) .js-invite-members-trigger{ data: { variant: 'success', classes: 'gl-mt-3 gl-sm-w-auto gl-w-full gl-sm-ml-3', trigger_source: 'project-members-page', @@ -36,13 +35,13 @@ - if project_can_be_shared? %h4 = _("Project members") - - if can_manage_project_members?(@project) + - if can?(current_user, :admin_project_member, @project) %p= share_project_description(@project) - else %p = html_escape(_("Members can be added by project %{i_open}Maintainers%{i_close} or %{i_open}Owners%{i_close}")) % { i_open: '<i>'.html_safe, i_close: '</i>'.html_safe } - - if Feature.disabled?(:invite_members_group_modal, @project.group) && can_manage_project_members?(@project) && project_can_be_shared? + - if Feature.disabled?(:invite_members_group_modal, @project.group) && can?(current_user, :admin_project_member, @project) && project_can_be_shared? - if !membership_locked? && @project.allowed_to_share_with_group? %ul.nav-links.nav.nav-tabs.gitlab-tabs{ role: 'tablist' } %li.nav-tab{ role: 'presentation' } @@ -52,13 +51,37 @@ .tab-content.gitlab-tab-content .tab-pane.active{ id: 'invite-member-pane', role: 'tabpanel' } - = render 'shared/members/invite_member', submit_url: project_project_members_path(@project), access_levels: ProjectMember.access_level_roles, default_access_level: @project_member.access_level, can_import_members?: can_import_members?, import_path: import_project_project_members_path(@project) + = render 'shared/members/invite_member', + submit_url: project_project_members_path(@project), + access_levels: ProjectMember.access_level_roles, + default_access_level: @project_member.access_level, + can_import_members?: can_admin_project_member?(@project), + import_path: import_project_project_members_path(@project) .tab-pane{ id: 'invite-group-pane', role: 'tabpanel', class: ('active' if membership_locked?) } - = render 'shared/members/invite_group', submit_url: project_group_links_path(@project), access_levels: ProjectGroupLink.access_options, default_access_level: ProjectGroupLink.default_access, group_link_field: 'link_group_id', group_access_field: 'link_group_access', groups_select_tag_data: { skip_groups: @skip_groups } + = render 'shared/members/invite_group', + submit_url: project_group_links_path(@project), + access_levels: ProjectGroupLink.access_options, + default_access_level: ProjectGroupLink.default_access, + group_link_field: 'link_group_id', + group_access_field: 'link_group_access', + groups_select_tag_data: { skip_groups: @skip_groups } - elsif !membership_locked? - .invite-member= render 'shared/members/invite_member', submit_url: project_project_members_path(@project), access_levels: ProjectMember.access_level_roles, default_access_level: @project_member.access_level, can_import_members?: can_import_members?, import_path: import_project_project_members_path(@project) + .invite-member + = render 'shared/members/invite_member', + submit_url: project_project_members_path(@project), + access_levels: ProjectMember.access_level_roles, + default_access_level: @project_member.access_level, + can_import_members?: can_admin_project_member?(@project), + import_path: import_project_project_members_path(@project) - elsif @project.allowed_to_share_with_group? - .invite-group= render 'shared/members/invite_group', access_levels: ProjectGroupLink.access_options, default_access_level: ProjectGroupLink.default_access, submit_url: project_group_links_path(@project), group_link_field: 'link_group_id', group_access_field: 'link_group_access', groups_select_tag_data: { skip_groups: @skip_groups } + .invite-group + = render 'shared/members/invite_group', + access_levels: ProjectGroupLink.access_options, + default_access_level: ProjectGroupLink.default_access, + submit_url: project_group_links_path(@project), + group_link_field: 'link_group_id', + group_access_field: 'link_group_access', + groups_select_tag_data: { skip_groups: @skip_groups } .js-project-members-list-app{ data: { members_data: project_members_app_data_json(@project, members: @project_members, group_links: @group_links, diff --git a/app/views/projects/runners/_specific_runners.html.haml b/app/views/projects/runners/_specific_runners.html.haml index eb376ff7960..5e999b7afb3 100644 --- a/app/views/projects/runners/_specific_runners.html.haml +++ b/app/views/projects/runners/_specific_runners.html.haml @@ -4,10 +4,6 @@ .bs-callout.help-callout - if valid_runner_registrars.include?('project') = _('These runners are specific to this project.') - %hr - = render partial: 'ci/runner/how_to_setup_runner_automatically', - locals: { type: s_('Runners|specific'), - clusters_path: project_clusters_path(@project) } - if params[:ci_runner_templates] %hr = render partial: 'ci/runner/setup_runner_in_aws', diff --git a/app/views/projects/security/configuration/show.html.haml b/app/views/projects/security/configuration/show.html.haml index d4a85893fa4..e8ac572df1d 100644 --- a/app/views/projects/security/configuration/show.html.haml +++ b/app/views/projects/security/configuration/show.html.haml @@ -1,6 +1,5 @@ - breadcrumb_title _("Security Configuration") - page_title _("Security Configuration") -- redesign_enabled = ::Feature.enabled?(:security_configuration_redesign, @project, default_enabled: :yaml) -- @content_class = "limit-container-width" unless fluid_layout || !redesign_enabled +- @content_class = "limit-container-width" unless fluid_layout #js-security-configuration-static{ data: { project_path: @project.full_path, upgrade_path: security_upgrade_path } } diff --git a/app/views/projects/settings/_general.html.haml b/app/views/projects/settings/_general.html.haml index 0891e3e0526..b185f45d129 100644 --- a/app/views/projects/settings/_general.html.haml +++ b/app/views/projects/settings/_general.html.haml @@ -19,8 +19,6 @@ = f.text_field :topics, value: @project.topic_list.join(', '), maxlength: 2000, class: "form-control gl-form-input" %p.form-text.text-muted= _('Separate topics with commas.') - = render_if_exists 'compliance_management/compliance_framework/project_settings', f: f - .row .form-group.col-md-9 = f.label :description, _('Project description (optional)'), class: 'label-bold' diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 4757f50739b..e515f1e7320 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -19,6 +19,7 @@ = render "archived_notice", project: @project = render_if_exists "projects/marked_for_deletion_notice", project: @project = render_if_exists "projects/ancestor_group_marked_for_deletion_notice", project: @project += render_if_exists 'projects/sast_entry_points', project: @project - view_path = @project.default_view diff --git a/app/views/projects/snippets/show.html.haml b/app/views/projects/snippets/show.html.haml index a296394a2e0..8ef53c40b11 100644 --- a/app/views/projects/snippets/show.html.haml +++ b/app/views/projects/snippets/show.html.haml @@ -3,7 +3,7 @@ - breadcrumb_title @snippet.to_reference - page_title "#{@snippet.title} (#{@snippet.to_reference})", _("Snippets") -#js-snippet-view{ data: {'qa-selector': 'snippet_view', 'snippet-gid': @snippet.to_global_id} } +#js-snippet-view{ data: {'qa-selector': 'snippet_view', 'snippet-gid': @snippet.to_global_id, 'report-abuse-path': snippet_report_abuse_path(@snippet) } } .row-content-block.top-block.content-component-block = render 'award_emoji/awards_block', awardable: @snippet, inline: true, api_awards_path: project_snippets_award_api_path(@snippet) |