Commit aa874f42 authored by 🤖 GitLab Bot 🤖's avatar 🤖 GitLab Bot 🤖
Browse files

Add latest changes from gitlab-org/gitlab@master

parent 0ae377c9
This diff is collapsed.
......@@ -7,6 +7,7 @@ import {
GlAvatarLabeled,
GlAvatarLink,
GlSearchBoxByType,
GlLoadingIcon,
} from '@gitlab/ui';
import { __, n__ } from '~/locale';
import IssuableAssignees from '~/sidebar/components/assignees/issuable_assignees.vue';
......@@ -33,6 +34,7 @@ export default {
GlAvatarLabeled,
GlAvatarLink,
GlSearchBoxByType,
GlLoadingIcon,
},
data() {
return {
......@@ -144,45 +146,48 @@ export default {
<gl-search-box-by-type v-model.trim="search" />
</template>
<template #items>
<gl-dropdown-item
:is-checked="selectedIsEmpty"
data-testid="unassign"
class="mt-2"
@click="selectAssignee()"
>{{ $options.i18n.unassigned }}</gl-dropdown-item
>
<gl-dropdown-divider data-testid="unassign-divider" />
<gl-dropdown-item
v-for="item in selected"
:key="item.id"
:is-checked="isChecked(item.username)"
@click="unselect(item.username)"
>
<gl-avatar-link>
<gl-avatar-labeled
:size="32"
:label="item.name"
:sub-label="item.username"
:src="item.avatarUrl || item.avatar"
/>
</gl-avatar-link>
</gl-dropdown-item>
<gl-dropdown-divider v-if="!selectedIsEmpty" data-testid="selected-user-divider" />
<gl-dropdown-item
v-for="unselectedUser in unSelectedFiltered"
:key="unselectedUser.id"
:data-testid="`item_${unselectedUser.name}`"
@click="selectAssignee(unselectedUser)"
>
<gl-avatar-link>
<gl-avatar-labeled
:size="32"
:label="unselectedUser.name"
:sub-label="unselectedUser.username"
:src="unselectedUser.avatarUrl || unselectedUser.avatar"
/>
</gl-avatar-link>
</gl-dropdown-item>
<gl-loading-icon v-if="$apollo.queries.participants.loading" size="lg" />
<template v-else>
<gl-dropdown-item
:is-checked="selectedIsEmpty"
data-testid="unassign"
class="mt-2"
@click="selectAssignee()"
>{{ $options.i18n.unassigned }}</gl-dropdown-item
>
<gl-dropdown-divider data-testid="unassign-divider" />
<gl-dropdown-item
v-for="item in selected"
:key="item.id"
:is-checked="isChecked(item.username)"
@click="unselect(item.username)"
>
<gl-avatar-link>
<gl-avatar-labeled
:size="32"
:label="item.name"
:sub-label="item.username"
:src="item.avatarUrl || item.avatar"
/>
</gl-avatar-link>
</gl-dropdown-item>
<gl-dropdown-divider v-if="!selectedIsEmpty" data-testid="selected-user-divider" />
<gl-dropdown-item
v-for="unselectedUser in unSelectedFiltered"
:key="unselectedUser.id"
:data-testid="`item_${unselectedUser.name}`"
@click="selectAssignee(unselectedUser)"
>
<gl-avatar-link>
<gl-avatar-labeled
:size="32"
:label="unselectedUser.name"
:sub-label="unselectedUser.username"
:src="unselectedUser.avatarUrl || unselectedUser.avatar"
/>
</gl-avatar-link>
</gl-dropdown-item>
</template>
</template>
</multi-select-dropdown>
</template>
......
......@@ -389,7 +389,6 @@ img.emoji {
See https://gitlab.com/gitlab-org/gitlab/-/issues/217418 for more details.
**/
.prepend-top-20 { margin-top: 20px; }
.prepend-left-20 { margin-left: 20px; }
.append-bottom-20 { margin-bottom: 20px; }
.ml-10 { margin-left: 4.5rem; }
.inline { display: inline-block; }
......
......@@ -27,6 +27,10 @@ class UploadsController < ApplicationController
feature_category :not_owned
def self.model_classes
MODEL_CLASSES
end
def uploader_class
PersonalFileUploader
end
......@@ -99,7 +103,7 @@ def secret?
end
def upload_model_class
MODEL_CLASSES[params[:model]] || raise(UnknownUploadModelError)
self.class.model_classes[params[:model]] || raise(UnknownUploadModelError)
end
def upload_model_class_has_mounts?
......@@ -112,3 +116,5 @@ def upload_mount_satisfied?
upload_model_class.uploader_options.has_key?(upload_mount)
end
end
UploadsController.prepend_if_ee('EE::UploadsController')
......@@ -27,3 +27,5 @@ class IssuablePolicy < BasePolicy
prevent :award_emoji
end
end
IssuablePolicy.prepend_if_ee('EE::IssuablePolicy')
......@@ -125,8 +125,6 @@ def deploy_page!(archive_public_path)
end
def create_pages_deployment(artifacts_path, build)
return unless Feature.enabled?(:zip_pages_deployments, project, default_enabled: true)
# we're using the full archive and pages daemon needs to read it
# so we want the total count from entries, not only "public/" directory
# because it better approximates work we need to do before we can serve the site
......
......@@ -10,7 +10,7 @@
= visibility_level_label(params[:visibility_level].to_i)
- else
= _('Any')
= icon('chevron-down')
= sprite_icon('chevron-down', css_class: 'dropdown-menu-toggle-icon gl-top-3')
%ul.dropdown-menu.dropdown-menu-right
%li
= link_to filter_projects_path(visibility_level: nil) do
......
= icon('spinner spin fw')
= loading_icon(css_class: "gl-vertical-align-text-bottom mr-1")
= _('Metrics Dashboard YAML definition') + '…'
= link_to _('Learn more'), help_page_path('operations/metrics/dashboards/yaml.md')
......@@ -15,7 +15,7 @@
= sort_options_hash[@sort]
- else
= sort_title_recently_created
= icon('chevron-down')
= sprite_icon('chevron-down', css_class: 'dropdown-menu-toggle-icon gl-top-3')
%ul.dropdown-menu.dropdown-menu-right
%li
- excluded_filters = [:state, :scope, :label_name, :milestone_id, :assignee_id, :author_id]
......
......@@ -8,7 +8,7 @@
= text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: _("Git revision"), class: 'search-input form-control input-mx-250 search-sha'
= button_tag class: 'btn btn-success' do
= sprite_icon('search')
.inline.prepend-left-20
.inline.gl-ml-5
.form-check.light
= check_box_tag :filter_ref, 1, @options[:filter_ref], class: 'form-check-input'
= label_tag :filter_ref, class: 'form-check-label' do
......
......@@ -16,7 +16,7 @@
%button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown'} }
%span.light
= tags_sort_options_hash[@sort]
= icon('chevron-down')
= sprite_icon('chevron-down', css_class: 'dropdown-menu-toggle-icon gl-top-3')
%ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable
%li.dropdown-header
= s_('TagsPage|Sort by')
......
......@@ -24,7 +24,7 @@
= hidden_field_tag :ref, default_ref
= button_tag type: 'button', title: default_ref, class: 'dropdown-menu-toggle wide js-branch-select monospace', required: true, data: { toggle: 'dropdown', selected: default_ref, field_name: 'ref' } do
.text-left.dropdown-toggle-text= default_ref
= icon('chevron-down')
= sprite_icon('chevron-down', css_class: 'dropdown-menu-toggle-icon gl-top-3')
= render 'shared/ref_dropdown', dropdown_class: 'wide'
.form-text.text-muted
= s_('TagsPage|Existing branch name, tag, or commit SHA')
......
......@@ -12,7 +12,7 @@
%button.dropdown-menu-toggle{ type: 'button', 'data-toggle' => 'dropdown' }
%span.dropdown-label
= options_hash[default_sort_by]
= icon('chevron-down')
= sprite_icon('chevron-down', css_class: 'dropdown-menu-toggle-icon gl-top-3')
%ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable
%li.dropdown-header
= _("Sort by")
......
......@@ -27,7 +27,7 @@
data: { toggle: "dropdown", field_name: "group_link[group_access]" } }
%span.dropdown-toggle-text
= group_link.human_access
= icon("chevron-down")
= sprite_icon("chevron-down", css_class: "dropdown-menu-toggle-icon gl-top-3")
.dropdown-menu.dropdown-select.dropdown-menu-right.dropdown-menu-selectable
= dropdown_title(_("Change permissions"))
.dropdown-content
......
......@@ -79,7 +79,7 @@
data: { toggle: "dropdown", field_name: "#{f.object_name}[access_level]", qa_selector: "access_level_dropdown" } }
%span.dropdown-toggle-text
= member.human_access
= icon("chevron-down")
= sprite_icon("chevron-down", css_class: "dropdown-menu-toggle-icon gl-top-3")
.dropdown-menu.dropdown-select.dropdown-menu-right.dropdown-menu-selectable
= dropdown_title(_("Change permissions"))
.dropdown-content
......
......@@ -5,7 +5,7 @@
.btn-group.w-100.dropdown.js-project-filter-dropdown-wrap{ role: "group" }
%button#sort-projects-dropdown.btn.btn-default.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown', display: 'static' } }
= toggle_text
= icon('chevron-down')
= sprite_icon('chevron-down', css_class: 'dropdown-menu-toggle-icon gl-top-3')
%ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable
%li.dropdown-header
= _("Sort by")
......
---
title: Add cleanup status field to graphQL ContainerRepositoryType
merge_request: 47544
author:
type: added
---
title: Container repository details GraphQL API
merge_request: 46560
author:
type: added
---
title: Add container repository destroy GraphQL mutation
merge_request: 47175
author:
type: added
---
title: GraphQL API for listing container repositories
merge_request: 44926
author:
type: added
---
title: Resolve admin/license timeout on large instances
merge_request: 46336
author:
type: performance
---
title: Do not convert unicode versions of trademark, copyright,
and registered trademark to emoji
merge_request: 45457
author:
type: fixed
---
title: Removed ACE editor from the codebase
merge_request: 46420
author:
type: removed
---
title: Tolerate UTF8 BOM character during frontmatter rendering
merge_request: 46062
author:
type: fixed
---
title: Update loading icon for buttons used in MR's set to merge automatically
merge_request: 45693
author:
type: changed
---
title: Adds feature flag to disable package events
merge_request: 45802
author:
type: changed
---
title: Adds rake task to generate package events file
merge_request: 47118
author:
type: added
---
title: Change the mutation and permissions for image note reposition
merge_request: 47161
author:
type: changed
---
title: Add repositionImageDiffNote GraphQL mutation to specifically reposition DiffNotes
on images
merge_request: 45958
author:
type: added
---
title: Block LFS requests on snippets
merge_request: 45874
author:
type: fixed
---
title: Throttle container cleanup policies execution by using a limited capacity worker
merge_request: 40740
author:
type: changed
---
title: Only set an ETag for the notes endpoint after all notes have been sent
merge_request: 46810
author:
type: performance
---
title: Add container repositories API
merge_request: 46495
author:
type: added
---
title: Fix pipeline security tab filters not showing
merge_request: 47294
author:
type: fixed
---
title: Forward deployment, add modal to warn users on Retry action
merge_request: 46416
author:
type: added
---
title: Fix 404 error from Commit Signature API when using Rugged
merge_request: 46736
author:
type: fixed
---
title: Add CI JWT signing key to application_setings
merge_request: 43950
author:
type: added
---
title: Add EC2 to AutoDevOps template
merge_request: 45651
author:
type: changed
---
title: Add GraphQL endpoints to lock, unlock and delete Terraform states
merge_request: 43955
author:
type: added
---
title: Remove default EKS Region dropdown in cluster create form
merge_request: 43017
author:
type: fixed
---
title: Bugfix email notification recipients for comments on Designs
merge_request: 46642
author:
type: fixed
---
title: Fix release assets link redirection
merge_request: 35381
author:
type: fixed
---
title: Add a stop review job for ECS
merge_request: 44717
author:
type: added
---
title: Update image upload path (SSE)
merge_request: 46967
author:
type: changed
---
title: Enable the ability to upload images via the SSE
merge_request: 36299
author:
type: added
---
title: Determine image relative paths
merge_request: 46208
author:
type: added
---
title: Make files header responsive and remove truncate name
merge_request: 46406
author:
type: changed
---
title: Match Jira users by email, username or name on jira issues import
merge_request: 33883
author:
type: changed
---
title: Fix a race condition checking whether a project is read-only
merge_request: 45160
author:
type: fixed
---
title: Prune loose objects during git garbage collection
merge_request: 39592
author:
type: changed
---
title: Make the repository read-only while running cleanup
merge_request: 45058
author:
type: changed
---
title: Resolve User stuck in 2FA setup page even if group disable 2FA enforce
merge_request: 46432
author:
type: fixed
---
title: NPM project level API
merge_request: 46867
author:
type: added
---
title: Add Web IDE Solarized Light theme support
merge_request: 46999
author:
type: added
---
title: Add ability to sort releases on Releases page
merge_request: 43963
author:
type: added
---
title: Fix aria label on IDE tab close button
merge_request: 45709
author:
type: fixed
---
title: Add Google Tag Manger to sign in/up and trial pages
merge_request: 38395
author:
type: changed
---
title: Update icons to svg for issuable pages
merge_request: 47596
author:
type: other
---
title: Replace mirror chevron down icon with svg
merge_request: 47459
author:
type: other