diff options
Diffstat (limited to 'app/views/projects')
34 files changed, 86 insertions, 143 deletions
diff --git a/app/views/projects/_files.html.haml b/app/views/projects/_files.html.haml index 712d6fabf82..e4eed63f45a 100644 --- a/app/views/projects/_files.html.haml +++ b/app/views/projects/_files.html.haml @@ -1,8 +1,10 @@ +- @no_breadcrumb_border = true - show_auto_devops_callout = show_auto_devops_callout?(@project) - is_project_overview = local_assigns.fetch(:is_project_overview, false) - ref = local_assigns.fetch(:ref) { current_ref } - project = local_assigns.fetch(:project) { @project } - add_page_startup_api_call logs_file_project_ref_path(@project, ref, @path, format: "json", offset: 0) +- source = visible_fork_source(@project) - if readme_path = @project.repository.readme_path - add_page_startup_api_call project_blob_path(@project, tree_join(@ref, readme_path), viewer: "rich", format: "json") @@ -16,7 +18,7 @@ = render 'projects/tree/tree_header', tree: @tree, is_project_overview: is_project_overview - if project.forked? && Feature.enabled?(:fork_divergence_counts, @project.fork_source) - = render 'projects/fork_info' + #js-fork-info{ data: { source_name: source ? source.full_name : '', source_path: source ? project_path(source) : '' } } - if is_project_overview .project-buttons.gl-mb-5.js-show-on-project-root{ data: { qa_selector: 'project_buttons' } } diff --git a/app/views/projects/_fork_info.html.haml b/app/views/projects/_fork_info.html.haml deleted file mode 100644 index 7fe30214e97..00000000000 --- a/app/views/projects/_fork_info.html.haml +++ /dev/null @@ -1,14 +0,0 @@ -.info-well.gl-sm-display-flex.gl-flex-direction-column - .well-segment.gl-p-5.gl-w-full.gl-display-flex - .gl-icon.s32.gl-mt-4.gl-mr-4.gl-text-center - = sprite_icon('fork') - - source = visible_fork_source(@project) - - if source - %div - #{ s_('ForkedFromProjectPath|Forked from') } - = link_to source.full_name, project_path(source), data: { qa_selector: 'forked_from_link' } - .gl-text-secondary - = fork_divergence_message(::Projects::Forks::DivergenceCounts.new(@project, @ref).counts) - - else - .gl-py-4 - = s_('ForkedFromProjectPath|Forked from an inaccessible project') diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index dc426f2f6b7..b9aeed188fa 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -14,6 +14,8 @@ %span.visibility-icon.gl-text-secondary.has-tooltip.gl-ml-2{ data: { container: 'body' }, title: visibility_icon_description(@project) } = visibility_level_icon(@project.visibility_level, options: { class: 'icon' }) = render_if_exists 'compliance_management/compliance_framework/compliance_framework_badge', project: @project, additional_classes: 'gl-align-self-center gl-ml-2' + - if @project.group + = render_if_exists 'shared/tier_badge', source: @project, source_type: 'Project' .home-panel-metadata.gl-font-sm.gl-text-secondary.gl-font-base.gl-font-weight-normal.gl-line-height-normal{ data: { qa_selector: 'project_id_content' }, itemprop: 'identifier' } - if can?(current_user, :read_project, @project) %span.gl-display-inline-block.gl-vertical-align-middle @@ -60,7 +62,7 @@ #{ s_('ForkedFromProjectPath|Forked from') } = link_to source.full_name, project_path(source), data: { qa_selector: 'forked_from_link' } - else - = s_('ForkedFromProjectPath|Forked from an inaccessible project') + = s_('ForkedFromProjectPath|Forked from an inaccessible project.') = render_if_exists "projects/home_mirror" diff --git a/app/views/projects/_import_project_pane.html.haml b/app/views/projects/_import_project_pane.html.haml index cc5271a1cd2..412c91544a6 100644 --- a/app/views/projects/_import_project_pane.html.haml +++ b/app/views/projects/_import_project_pane.html.haml @@ -7,6 +7,14 @@ %h5.gl-display-flex = _("Import project from") = link_to _('History'), import_history_index_path, class: 'gl-link gl-ml-auto gl-font-weight-normal' + %div + = render Pajamas::AlertComponent.new(variant: :tip, + alert_options: { class: 'gl-my-3' }, + dismissible: false) do |c| + = c.body do + - docs_link_url = help_page_path('user/group/import/index') + '#migrate-groups-by-direct-transfer-recommended' + - docs_link = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: docs_link_url } + = html_escape(_("Importing GitLab projects? Migrating GitLab projects when migrating groups by direct transfer is in Beta. %{link_start}Learn more.%{link_end}")) % { link_start: docs_link, link_end: '</a>'.html_safe } .import-buttons - if gitlab_project_import_enabled? .import_gitlab_project.has-tooltip{ data: { container: 'body', qa_selector: 'gitlab_import_button' } } diff --git a/app/views/projects/artifacts/index.html.haml b/app/views/projects/artifacts/index.html.haml index 9cbc149177c..7fa47aed7c6 100644 --- a/app/views/projects/artifacts/index.html.haml +++ b/app/views/projects/artifacts/index.html.haml @@ -6,4 +6,6 @@ .gl-mb-6 %strong= s_('Artifacts|Total artifacts size') = number_to_human_size(@total_size, precicion: 2) - #js-artifact-management{ data: { "project-path" => @project.full_path } } + #js-artifact-management{ data: { "project-path": @project.full_path, + "can-destroy-artifacts" => can?(current_user, :destroy_artifacts, @project).to_s, + "artifacts-management-feedback-image-path": image_path('illustrations/chat-bubble-sm.svg') } } diff --git a/app/views/projects/blob/_template_selectors.html.haml b/app/views/projects/blob/_template_selectors.html.haml index 4fe68c1ce1a..c1f4633f69f 100644 --- a/app/views/projects/blob/_template_selectors.html.haml +++ b/app/views/projects/blob/_template_selectors.html.haml @@ -1,8 +1,5 @@ .template-selectors-menu.gl-pl-3 .template-selector-dropdowns-wrap - .template-type-selector.js-template-type-selector-wrap.hidden - - toggle_text = should_suggest_gitlab_ci_yml? ? '.gitlab-ci.yml' : 'Select a template type' - = dropdown_tag(_(toggle_text), options: { toggle_class: 'js-template-type-selector', dropdown_class: 'dropdown-menu-selectable', data: { qa_selector: 'template_type_dropdown' } }) .license-selector.js-license-selector-wrap.js-template-selector-wrap.hidden = dropdown_tag(_("Apply a template"), options: { toggle_class: 'js-license-selector', dropdown_class: 'dropdown-menu-selectable', filter: true, placeholder: "Filter", data: { data: licenses_for_select(@project), project: @project.name, fullname: @project.namespace.human_name, qa_selector: 'license_dropdown' } }) .gitignore-selector.js-gitignore-selector-wrap.js-template-selector-wrap.hidden diff --git a/app/views/projects/branch_defaults/_branch_names_fields.html.haml b/app/views/projects/branch_defaults/_branch_names_fields.html.haml index 65f975fbd9e..393b19e6c5a 100644 --- a/app/views/projects/branch_defaults/_branch_names_fields.html.haml +++ b/app/views/projects/branch_defaults/_branch_names_fields.html.haml @@ -10,5 +10,5 @@ %p.form-text.text-muted = s_('ProjectSettings|Leave empty to use default template.') = sprintf(s_('ProjectSettings|Maximum %{maxLength} characters.'), { maxLength: Issue::MAX_BRANCH_TEMPLATE }) - - branch_name_help_link = help_page_path('user/project/repository/web_editor.md', anchor: 'create-a-new-branch-from-an-issue') + - branch_name_help_link = help_page_path('user/project/merge_requests/creating_merge_requests.md', anchor: 'from-an-issue') = link_to _('What variables can I use?'), branch_name_help_link, target: "_blank" diff --git a/app/views/projects/buttons/_fork.html.haml b/app/views/projects/buttons/_fork.html.haml index 97186149a9d..6d05f1dc955 100644 --- a/app/views/projects/buttons/_fork.html.haml +++ b/app/views/projects/buttons/_fork.html.haml @@ -11,7 +11,7 @@ - button_class = 'disabled' if disabled_tooltip %span.btn-group{ class: ('has-tooltip' if disabled_tooltip), title: disabled_tooltip } - = link_to new_project_fork_path(@project), class: "gl-button btn btn-default fork-btn #{button_class}" do + = link_to new_project_fork_path(@project), class: "gl-button btn btn-default fork-btn #{button_class}", data: { qa_selector: 'fork_button' } do = sprite_icon('fork', css_class: 'icon') %span= s_('ProjectOverview|Fork') = link_to project_forks_path(@project), title: n_(s_('ProjectOverview|Forks'), s_('ProjectOverview|Forks'), @project.forks_count), class: "gl-button btn btn-default count has-tooltip fork-count #{count_class}" do diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index b48369322e4..ecdd43a54f9 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -87,7 +87,7 @@ %td - if job.duration %p.duration - = custom_icon("icon_timer") + = sprite_icon("timer") = duration_in_numbers(job.duration) - if job.finished_at diff --git a/app/views/projects/commit/_multiple_signatures_signature_badge.html.haml b/app/views/projects/commit/_multiple_signatures_signature_badge.html.haml index 74515438af2..2568a69cc2c 100644 --- a/app/views/projects/commit/_multiple_signatures_signature_badge.html.haml +++ b/app/views/projects/commit/_multiple_signatures_signature_badge.html.haml @@ -1,6 +1,5 @@ -- title = capture do - = html_escape(_('This commit was signed with %{strong_open}multiple%{strong_close} signatures.')) % { strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe } - -- locals = { signature: signature, title: title, label: _('Unverified'), css_class: 'invalid', icon: 'status_notfound_borderless' } +- title = _('Multiple signatures') +- description = _('This commit was signed with multiple signatures.') +- locals = { signature: signature, title: title, description: description, label: _('Unverified'), css_class: 'invalid' } = render partial: 'projects/commit/signature_badge', locals: locals diff --git a/app/views/projects/commit/_other_user_signature_badge.html.haml b/app/views/projects/commit/_other_user_signature_badge.html.haml index bb843bee7c9..ffc4b25dc21 100644 --- a/app/views/projects/commit/_other_user_signature_badge.html.haml +++ b/app/views/projects/commit/_other_user_signature_badge.html.haml @@ -1,6 +1,5 @@ -- title = capture do - = _("This commit was signed with a different user's verified signature.") - -- locals = { signature: signature, title: title, label: _('Unverified'), css_class: 'invalid', icon: 'status_notfound_borderless', show_user: true } +- title = _("Different user's signature") +- description = _("This commit was signed with a different user's verified signature.") +- locals = { signature: signature, title: title, description: description, label: _('Unverified'), css_class: 'invalid' } = render partial: 'projects/commit/signature_badge', locals: locals diff --git a/app/views/projects/commit/_same_user_different_email_signature_badge.html.haml b/app/views/projects/commit/_same_user_different_email_signature_badge.html.haml index 629d3cfaf74..61fdf6fc87a 100644 --- a/app/views/projects/commit/_same_user_different_email_signature_badge.html.haml +++ b/app/views/projects/commit/_same_user_different_email_signature_badge.html.haml @@ -1,6 +1,5 @@ -- title = capture do - = html_escape(_('This commit was signed with a verified signature, but the committer email is not associated with the GPG Key.')) - -- locals = { signature: signature, title: title, label: _('Unverified'), css_class: ['invalid'], icon: 'status_notfound_borderless', show_user: true } +- title = _('GPG key mismatch') +- description = _('This commit was signed with a verified signature, but the committer email is not associated with the GPG Key.') +- locals = { signature: signature, title: title, description: description, label: _('Unverified'), css_class: ['invalid'] } = render partial: 'projects/commit/signature_badge', locals: locals diff --git a/app/views/projects/commit/_signature_badge.html.haml b/app/views/projects/commit/_signature_badge.html.haml index ad6b524c01b..41ba581b9d9 100644 --- a/app/views/projects/commit/_signature_badge.html.haml +++ b/app/views/projects/commit/_signature_badge.html.haml @@ -1,39 +1,35 @@ - signature = local_assigns.fetch(:signature) - title = local_assigns.fetch(:title) +- description = local_assigns.fetch(:description, nil) - label = local_assigns.fetch(:label) - css_class = local_assigns.fetch(:css_class) -- icon = local_assigns.fetch(:icon) -- show_user = local_assigns.fetch(:show_user, false) - css_classes = commit_signature_badge_classes(css_class) - title = capture do .gpg-popover-status - .gpg-popover-icon{ class: css_class } - = sprite_icon(icon) %div - = title + %strong + = title -- content = capture do - - if show_user - .clearfix - - uri_signature_badge_user = "projects/commit/#{'x509/' if signature.x509?}signature_badge_user" - = render partial: "#{uri_signature_badge_user}", locals: { signature: signature } + %p.gl-my-3 + = description +- content = capture do - if signature.x509? = render partial: "projects/commit/x509/certificate_details", locals: { signature: signature } = link_to(_('Learn more about X.509 signed commits'), help_page_path('user/project/repository/x509_signed_commits/index.md'), class: 'gl-link gl-display-block') - - elsif ::Feature.enabled?(:ssh_commit_signatures, signature.project) && signature.ssh? + - elsif signature.ssh? = _('SSH key fingerprint:') - %span.gl-font-monospace= signature.key&.fingerprint_sha256 || _('Unknown') + %span.gl-font-monospace= signature.key_fingerprint_sha256 || _('Unknown') - = link_to(_('Learn about signing commits with SSH keys.'), help_page_path('user/project/repository/ssh_signed_commits/index.md'), class: 'gl-link gl-display-block') + = link_to(_('Learn about signing commits with SSH keys.'), help_page_path('user/project/repository/ssh_signed_commits/index.md'), class: 'gl-link gl-display-block gl-mt-3') - else = _('GPG Key ID:') %span.gl-font-monospace= signature.gpg_key_primary_keyid - = link_to(_('Learn more about signing commits'), help_page_path('user/project/repository/gpg_signed_commits/index.md'), class: 'gl-link gl-display-block') + = link_to(_('Learn about signing commits'), help_page_path('user/project/repository/gpg_signed_commits/index.md'), class: 'gl-link gl-display-block gl-mt-3') %a{ role: 'button', tabindex: 0, class: css_classes, data: { toggle: 'popover', html: 'true', placement: 'top', title: title, content: content } } = label diff --git a/app/views/projects/commit/_unverified_signature_badge.html.haml b/app/views/projects/commit/_unverified_signature_badge.html.haml index 0ce8e06382b..0eae8d5564d 100644 --- a/app/views/projects/commit/_unverified_signature_badge.html.haml +++ b/app/views/projects/commit/_unverified_signature_badge.html.haml @@ -1,6 +1,5 @@ -- title = capture do - = html_escape(_('This commit was signed with an %{strong_open}unverified%{strong_close} signature.')) % { strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe } - -- locals = { signature: signature, title: title, label: _('Unverified'), css_class: 'invalid', icon: 'status_notfound_borderless' } +- title = _('Unverified signature') +- description = _('This commit was signed with an unverified signature.') +- locals = { signature: signature, title: title, description: description, label: _('Unverified'), css_class: 'invalid' } = render partial: 'projects/commit/signature_badge', locals: locals diff --git a/app/views/projects/commit/_verified_signature_badge.html.haml b/app/views/projects/commit/_verified_signature_badge.html.haml index 357ad467539..417d816c711 100644 --- a/app/views/projects/commit/_verified_signature_badge.html.haml +++ b/app/views/projects/commit/_verified_signature_badge.html.haml @@ -1,6 +1,5 @@ -- title = capture do - = html_escape(_('This commit was signed with a %{strong_open}verified%{strong_close} signature and the committer email is verified to belong to the same user.')) % { strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe } - -- locals = { signature: signature, title: title, label: _('Verified'), css_class: 'valid', icon: 'status_success_borderless', show_user: true } +- title = _('Verified commit') +- description = _('This commit was signed with a verified signature and the committer email was verified to belong to the same user.') +- locals = { signature: signature, title: title, description: description, label: _('Verified'), css_class: 'valid' } = render partial: 'projects/commit/signature_badge', locals: locals diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml index c129d978e7e..8f802792e6a 100644 --- a/app/views/projects/commits/show.html.haml +++ b/app/views/projects/commits/show.html.haml @@ -10,7 +10,7 @@ .nav-block .tree-ref-container .tree-ref-holder - #js-project-commits-ref-switcher{ data: { "project-id" => @project.id, "ref" => @ref, "commits_path": project_commits_path(@project) } } + #js-project-commits-ref-switcher{ data: { "project-id" => @project.id, "ref" => @ref, "commits_path": project_commits_path(@project), "ref_type": @ref_type.to_s } } %ul.breadcrumb.repo-breadcrumb = commits_breadcrumbs diff --git a/app/views/projects/feature_flags/new.html.haml b/app/views/projects/feature_flags/new.html.haml index 9fef9864475..c91487ad198 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: Users::CalloutsHelper::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: 'scope-environments-with-specs'), + environments_scope_docs_path: help_page_path('ci/environments/index.md', anchor: 'limit-the-environment-scope-of-a-cicd-variable'), project_id: @project.id } } diff --git a/app/views/projects/forks/new.html.haml b/app/views/projects/forks/new.html.haml index a9913fe3d5e..e9c6b3fcd22 100644 --- a/app/views/projects/forks/new.html.haml +++ b/app/views/projects/forks/new.html.haml @@ -5,6 +5,7 @@ new_group_path: new_group_path, project_full_path: @project.full_path, visibility_help_path: help_page_path("user/public_access"), + cancel_path: project_path(@project), project_id: @project.id, project_name: @project.name, project_path: @project.path, diff --git a/app/views/projects/imports/new.html.haml b/app/views/projects/imports/new.html.haml index 306f24d717b..efb364bd013 100644 --- a/app/views/projects/imports/new.html.haml +++ b/app/views/projects/imports/new.html.haml @@ -16,4 +16,4 @@ = render 'shared/import_form', f: f .form-actions - = f.submit 'Start import', class: 'gl-button btn btn-confirm', data: { disable_with: false } + = f.submit 'Start import', pajamas_button: true, data: { disable_with: false } diff --git a/app/views/projects/issues/_work_item_links.html.haml b/app/views/projects/issues/_work_item_links.html.haml index 72f9ec2ff16..3deceacec8d 100644 --- a/app/views/projects/issues/_work_item_links.html.haml +++ b/app/views/projects/issues/_work_item_links.html.haml @@ -1 +1,5 @@ -.js-work-item-links-root{ data: { issuable_id: @issue.id, iid: @issue.iid, project_path: @project.full_path, wi: work_items_index_data(@project) } } +.js-work-item-links-root{ data: { issuable_id: @issue.id, iid: @issue.iid, + project_path: @project.full_path, + wi: work_items_index_data(@project), + register_path: new_user_registration_path(redirect_to_referer: 'yes'), + sign_in_path: new_session_path(:user, redirect_to_referer: 'yes') } } diff --git a/app/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml b/app/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml index fb950611f81..0123c5efd3d 100644 --- a/app/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml +++ b/app/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml @@ -47,7 +47,6 @@ - if moved_mr_sidebar_enabled? %li.gl-dropdown-divider %hr.dropdown-divider - %li.gl-dropdown-item - = link_to new_abuse_report_path(user_id: @merge_request.author.id, ref_url: merge_request_url(@merge_request)), class: 'dropdown-item' do - .gl-dropdown-item-text-wrapper - = _('Report abuse to administrator') + #js-report-abuse-dropdown-item{ data: { report_abuse_path: add_category_abuse_reports_path, reported_user_id: @merge_request.author.id, reported_from_url: merge_request_url(@merge_request) } } + +#js-report-abuse-drawer diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 71f8e4c32f5..b96d869e9d7 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -12,6 +12,7 @@ .issuable-main-info .merge-request-title.title %span.merge-request-title-text.js-onboarding-mr-item + = hidden_merge_request_icon(merge_request) = link_to merge_request.title, merge_request_path(merge_request), class: 'js-prefetch-document' - if merge_request.tasks? %span.task-status.d-none.d-sm-inline-block diff --git a/app/views/projects/merge_requests/_mr_title.html.haml b/app/views/projects/merge_requests/_mr_title.html.haml index a73d2aa5cc4..9d25603994a 100644 --- a/app/views/projects/merge_requests/_mr_title.html.haml +++ b/app/views/projects/merge_requests/_mr_title.html.haml @@ -16,7 +16,7 @@ .detail-page-header.border-bottom-0.pt-0.pb-0.gl-display-block{ class: "gl-md-display-flex! #{'is-merge-request' if moved_mr_sidebar_enabled? && !fluid_layout}" } .detail-page-header-body .issuable-meta.gl-display-flex - #js-issuable-header-warnings + #js-issuable-header-warnings{ data: { hidden: @merge_request.hidden?.to_s } } %h1.title.page-title.gl-font-size-h-display.gl-my-0.gl-display-inline-block{ data: { qa_selector: 'title_content' } } = markdown_field(@merge_request, :title) diff --git a/app/views/projects/merge_requests/_page.html.haml b/app/views/projects/merge_requests/_page.html.haml index 9d79352659c..47eb3e016d3 100644 --- a/app/views/projects/merge_requests/_page.html.haml +++ b/app/views/projects/merge_requests/_page.html.haml @@ -69,7 +69,7 @@ = render "projects/merge_requests/awards_block" = render "projects/merge_requests/widget" - if mr_action === "show" - - add_page_startup_api_call Feature.enabled?(:paginated_mr_discussions, @project) ? discussions_path(@merge_request, per_page: 20) : discussions_path(@merge_request) + - add_page_startup_api_call discussions_path(@merge_request, per_page: 20) - add_page_startup_api_call widget_project_json_merge_request_path(@project, @merge_request, format: :json) - add_page_startup_api_call cached_widget_project_json_merge_request_path(@project, @merge_request, format: :json) #js-vue-mr-discussions{ data: { notes_data: notes_data(@merge_request).to_json, diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index 8ff7fe6da71..95ef856daba 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -3,6 +3,7 @@ - page_title @milestone.title, _('Milestones') - page_description @milestone.description_html - add_page_specific_style 'page_bundles/milestone' +- add_page_specific_style 'page_bundles/issuable' - add_page_startup_api_call milestone_tab_path(@milestone, 'issues', show_project_name: false) diff --git a/app/views/projects/ml/experiments/show.html.haml b/app/views/projects/ml/experiments/show.html.haml index 2c350439762..143981eebe6 100644 --- a/app/views/projects/ml/experiments/show.html.haml +++ b/app/views/projects/ml/experiments/show.html.haml @@ -11,4 +11,6 @@ #js-show-ml-experiment{ data: { candidates: items, metrics: metrics, - params: params } } + params: params, + pagination: @pagination.to_json +} } diff --git a/app/views/projects/pages/new.html.haml b/app/views/projects/pages/new.html.haml index f1f3510d0f8..b9d2af9cf19 100644 --- a/app/views/projects/pages/new.html.haml +++ b/app/views/projects/pages/new.html.haml @@ -1,8 +1,14 @@ -%section.js-search-settings-section - - if Feature.enabled?(:use_pipeline_wizard_for_pages, @project.group) - #js-pages{ data: @pipeline_wizard_data } +- if Feature.enabled?(:show_pages_in_deployments_menu, current_user, type: :experiment) + - @breadcrumb_link = project_pages_path(@project) + - breadcrumb_title s_('GitLabPages|Pages') + - page_title s_('GitLabPages|Pages') +- else + %section.js-search-settings-section - - else - = render 'header' +- if Feature.enabled?(:use_pipeline_wizard_for_pages, @project.group) + #js-pages{ data: @pipeline_wizard_data } - = render 'use' +- else + = render 'header' + + = render 'use' diff --git a/app/views/projects/pipeline_schedules/index.html.haml b/app/views/projects/pipeline_schedules/index.html.haml index cb7cd631859..ab86d505f0f 100644 --- a/app/views/projects/pipeline_schedules/index.html.haml +++ b/app/views/projects/pipeline_schedules/index.html.haml @@ -6,7 +6,7 @@ #pipeline-schedules-callout{ data: { docs_url: help_page_path('ci/pipelines/schedules'), illustration_url: image_path('illustrations/pipeline_schedule_callout.svg') } } - if Feature.enabled?(:pipeline_schedules_vue, @project) - #pipeline-schedules-app{ data: { full_path: @project.full_path } } + #pipeline-schedules-app{ data: { full_path: @project.full_path, pipelines_path: project_pipelines_path(@project) } } - else .top-area - schedule_path_proc = ->(scope) { pipeline_schedules_path(@project, scope: scope) } diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml index 1a079324a0f..8f7f0a15e69 100644 --- a/app/views/projects/pipelines/_info.html.haml +++ b/app/views/projects/pipelines/_info.html.haml @@ -1,4 +1,4 @@ -- if Feature.enabled?(:pipeline_name, @pipeline.project) && @pipeline.name +- if @pipeline.name .gl-border-t.gl-p-5.gl-px-0 %h3.gl-m-0.gl-text-body = @pipeline.name @@ -53,7 +53,7 @@ .well-segment{ 'data-testid': 'commit-row' } .icon-container.commit-icon = sprite_icon('commit', css_class: 'gl-top-0!') - - if Feature.enabled?(:pipeline_name, @pipeline.project) && @pipeline.name + - if @pipeline.name = markdown(commit.title, pipeline: :single_line) = clipboard_button(text: @pipeline.sha, title: _("Copy commit SHA")) = link_to commit.short_id, project_commit_path(@project, @pipeline.sha), class: "commit-sha" diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml index 1b35de85145..b27f5a0e5ed 100644 --- a/app/views/projects/settings/ci_cd/show.html.haml +++ b/app/views/projects/settings/ci_cd/show.html.haml @@ -43,7 +43,10 @@ = _("Runners are processes that pick up and execute CI/CD jobs for GitLab.") = link_to s_('What is GitLab Runner?'), 'https://docs.gitlab.com/runner/', target: '_blank', rel: 'noopener noreferrer' .settings-content - = render 'projects/runners/settings' + - if Feature.enabled?(:project_runners_vue_ui, @project) + #js-project-runners{ data: { project_full_path: @project.full_path } } + - else + = render 'projects/runners/settings' - if Gitlab::CurrentSettings.current_application_settings.keep_latest_artifact? %section.settings.no-animate#js-artifacts-settings{ class: ('expanded' if expanded) } diff --git a/app/views/projects/settings/repository/_protected_branches.html.haml b/app/views/projects/settings/repository/_protected_branches.html.haml index d2356b5df09..340883ba853 100644 --- a/app/views/projects/settings/repository/_protected_branches.html.haml +++ b/app/views/projects/settings/repository/_protected_branches.html.haml @@ -1,2 +1,2 @@ -= render "protected_branches/index" += render "protected_branches/index", protected_branch_entity: protected_branch_entity = render "projects/protected_tags/index" diff --git a/app/views/projects/settings/repository/show.html.haml b/app/views/projects/settings/repository/show.html.haml index 306ce47cee7..953bfcf71ab 100644 --- a/app/views/projects/settings/repository/show.html.haml +++ b/app/views/projects/settings/repository/show.html.haml @@ -13,7 +13,7 @@ -# The shared parts of the views can be found in the `shared` directory. -# Those are used throughout the actual views. These `shared` views are then -# reused in EE. -= render "projects/settings/repository/protected_branches" += render "projects/settings/repository/protected_branches", protected_branch_entity: @project = render "shared/deploy_tokens/index", group_or_project: @project, description: deploy_token_description = render @deploy_keys = render "projects/cleanup/show" diff --git a/app/views/projects/triggers/_index.html.haml b/app/views/projects/triggers/_index.html.haml index a7f29b5cbf9..de127d15351 100644 --- a/app/views/projects/triggers/_index.html.haml +++ b/app/views/projects/triggers/_index.html.haml @@ -6,32 +6,7 @@ - c.body do = render 'projects/triggers/form', btn_text: _('Add trigger') .gl-mb-5 - - if Feature.enabled?(:ci_pipeline_triggers_settings_vue_ui, @project) - #js-ci-pipeline-triggers-list.triggers-list{ data: { triggers: @triggers_json } } - - else - - if @triggers.any? - .table-responsive.triggers-list - %table.table - %thead - %th - %strong - = _('Token') - %th - %strong - = _('Description') - %th - %strong - = _('Owner') - %th - %strong - = _('Last used') - %th - = render partial: 'projects/triggers/trigger', collection: @triggers, as: :trigger - - else - = render Pajamas::AlertComponent.new(variant: :warning, show_icon: false, dismissible: false, - alert_options: { data: { testid: 'no_triggers_content' }}) do |c| - = c.body do - = _('No triggers exist yet. Use the form above to create one.') + #js-ci-pipeline-triggers-list.triggers-list{ data: { triggers: @triggers_json } } - c.footer do %p = _("These examples show how to trigger this project's pipeline for a branch or tag.") diff --git a/app/views/projects/triggers/_trigger.html.haml b/app/views/projects/triggers/_trigger.html.haml deleted file mode 100644 index bce7dc8a94b..00000000000 --- a/app/views/projects/triggers/_trigger.html.haml +++ /dev/null @@ -1,37 +0,0 @@ -%tr - %td - - if trigger.has_token_exposed? - %span= trigger.token - = clipboard_button(text: trigger.token, title: _("Copy trigger token"), testid: 'clipboard-btn') - - else - %span= trigger.short_token - - .gl-display-inline-block.gl-ml-3 - - unless trigger.can_access_project? - = gl_badge_tag s_('Trigger|invalid'), { variant: :danger }, { title: s_('Trigger|Trigger user has insufficient permissions to project'), data: { toggle: 'tooltip', container: 'body' } } - - %td - - if trigger.description? && trigger.description.length > 15 - %span.has-tooltip{ title: trigger.description }= truncate(trigger.description, length: 15) - - else - = trigger.description - - %td - - if trigger.owner - .trigger-owner.sr-only= trigger.owner.name - = user_avatar(user: trigger.owner, size: 20) - - %td - - if trigger.last_used - = time_ago_with_tooltip trigger.last_used - - else - Never - - %td.text-right.gl-white-space-nowrap - - revoke_trigger_confirmation = "By revoking a trigger you will break any processes making use of it. Are you sure?" - - if can?(current_user, :admin_trigger, trigger) - = link_to edit_project_trigger_path(@project, trigger), method: :get, title: "Edit", class: "gl-button btn btn-default btn-icon" do - = sprite_icon('pencil') - - if can?(current_user, :manage_trigger, trigger) - = link_to project_trigger_path(@project, trigger), aria: { label: _('Revoke') }, data: { confirm: revoke_trigger_confirmation, testid: 'trigger_revoke_button', confirm_btn_variant: "danger" }, method: :delete, title: "Revoke", class: "gl-button btn btn-default btn-icon btn-trigger-revoke gl-ml-3" do - = sprite_icon('remove') |