Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
GitLab Bot
parent
68be0d9a18
commit
7bacfbe182
11 changed files with 57 additions and 162 deletions
|
|
@ -92,13 +92,8 @@
|
|||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
&.sortable-ghost {
|
||||
opacity: 0.3;
|
||||
}
|
||||
|
||||
.prioritized-labels:not(.is-not-draggable) & {
|
||||
box-shadow: 0 1px 2px $issue-boards-card-shadow;
|
||||
cursor: move;
|
||||
cursor: grab;
|
||||
border: 0;
|
||||
|
||||
|
|
@ -108,126 +103,20 @@
|
|||
}
|
||||
}
|
||||
|
||||
.btn-action {
|
||||
.fa {
|
||||
font-size: 18px;
|
||||
vertical-align: middle;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
color: $blue-600;
|
||||
|
||||
&.remove-row {
|
||||
color: $red-500;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.color-label {
|
||||
padding: $gl-padding-4 $grid-size;
|
||||
}
|
||||
|
||||
.prepend-description-left {
|
||||
vertical-align: top;
|
||||
line-height: 24px;
|
||||
}
|
||||
}
|
||||
|
||||
.prioritized-labels {
|
||||
margin-bottom: 30px;
|
||||
|
||||
.add-priority {
|
||||
display: none;
|
||||
color: $gray-light;
|
||||
}
|
||||
|
||||
li:hover {
|
||||
.draggable-handler {
|
||||
display: inline-block;
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.other-labels {
|
||||
.remove-priority {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
.filtered-labels {
|
||||
font-size: 0;
|
||||
padding: 12px 16px;
|
||||
|
||||
.label-row {
|
||||
margin-top: 4px;
|
||||
margin-bottom: 4px;
|
||||
|
||||
&:not(:last-child) {
|
||||
margin-right: 8px;
|
||||
}
|
||||
}
|
||||
|
||||
.label-remove {
|
||||
border-left: 1px solid $label-remove-border;
|
||||
z-index: 3;
|
||||
border-radius: $label-border-radius;
|
||||
padding: 6px 10px 6px 9px;
|
||||
|
||||
&:hover {
|
||||
box-shadow: inset 0 0 0 80px $label-remove-border;
|
||||
}
|
||||
}
|
||||
|
||||
.btn {
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
a.btn {
|
||||
padding: 0;
|
||||
|
||||
.has-tooltip {
|
||||
top: 0;
|
||||
border-top-right-radius: 0;
|
||||
border-bottom-right-radius: 0;
|
||||
line-height: 1.1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.label-subscription {
|
||||
vertical-align: middle;
|
||||
|
||||
.dropdown-group-label a {
|
||||
cursor: pointer;
|
||||
}
|
||||
.prioritized-labels .add-priority,
|
||||
.other-labels .remove-priority {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.label-subscribe-button {
|
||||
width: 105px;
|
||||
font-weight: 200;
|
||||
|
||||
.label-subscribe-button-icon {
|
||||
&[disabled] {
|
||||
opacity: 0.5;
|
||||
pointer-events: none;
|
||||
}
|
||||
}
|
||||
|
||||
.label-subscribe-button-loading {
|
||||
display: none;
|
||||
}
|
||||
|
||||
&.disabled {
|
||||
.label-subscribe-button-icon {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.label-subscribe-button-loading {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.labels-container {
|
||||
|
|
@ -255,11 +144,6 @@
|
|||
}
|
||||
|
||||
.label-list-item {
|
||||
.content-list &::before,
|
||||
.content-list &::after {
|
||||
content: none;
|
||||
}
|
||||
|
||||
.label-name {
|
||||
width: 200px;
|
||||
|
||||
|
|
@ -268,37 +152,16 @@
|
|||
}
|
||||
}
|
||||
|
||||
.label {
|
||||
padding: 4px $grid-size;
|
||||
font-size: $label-font-size;
|
||||
position: relative;
|
||||
top: $gl-padding-4;
|
||||
}
|
||||
|
||||
.label-action {
|
||||
color: $gray-700;
|
||||
cursor: pointer;
|
||||
|
||||
svg {
|
||||
fill: $gray-700;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
color: $blue-600;
|
||||
|
||||
svg {
|
||||
fill: $blue-600;
|
||||
}
|
||||
}
|
||||
|
||||
&.remove-row {
|
||||
&:hover {
|
||||
color: $red-500;
|
||||
|
||||
svg {
|
||||
fill: $red-500;
|
||||
}
|
||||
}
|
||||
&.remove-row:hover {
|
||||
color: $red-500;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
-# Only show it in the first page
|
||||
- hide = @available_labels.empty? || (params[:page].present? && params[:page] != '1')
|
||||
.prioritized-labels{ class: [('hide' if hide), ('is-not-draggable' unless can_admin_label)] }
|
||||
.prioritized-labels.gl-mb-7{ class: [('hide' if hide), ('is-not-draggable' unless can_admin_label)] }
|
||||
%h5.gl-mt-3= _('Prioritized Labels')
|
||||
.content-list.manage-labels-list.js-prioritized-labels{ data: { url: set_priorities_project_labels_path(@project), sortable: can_admin_label } }
|
||||
#js-priority-labels-empty-state.priority-labels-empty-state{ class: "#{'hidden' unless @prioritized_labels.empty? && search.blank?}" }
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fix auto-deploy-image fetches deprecated stable repository and causes an error
|
||||
merge_request: 45984
|
||||
author:
|
||||
type: fixed
|
||||
|
|
@ -21153,7 +21153,7 @@ enum VisibilityScopesEnum {
|
|||
}
|
||||
|
||||
"""
|
||||
Represents the count of vulnerabilities by severity on a particular day
|
||||
Represents the count of vulnerabilities by severity on a particular day. This data is retained for 365 days
|
||||
"""
|
||||
type VulnerabilitiesCountByDay {
|
||||
"""
|
||||
|
|
@ -21198,7 +21198,7 @@ type VulnerabilitiesCountByDay {
|
|||
}
|
||||
|
||||
"""
|
||||
Represents the number of vulnerabilities for a particular severity on a particular day
|
||||
Represents the number of vulnerabilities for a particular severity on a particular day. This data is retained for 365 days
|
||||
"""
|
||||
type VulnerabilitiesCountByDayAndSeverity {
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -61224,7 +61224,7 @@
|
|||
{
|
||||
"kind": "OBJECT",
|
||||
"name": "VulnerabilitiesCountByDay",
|
||||
"description": "Represents the count of vulnerabilities by severity on a particular day",
|
||||
"description": "Represents the count of vulnerabilities by severity on a particular day. This data is retained for 365 days",
|
||||
"fields": [
|
||||
{
|
||||
"name": "critical",
|
||||
|
|
@ -61381,7 +61381,7 @@
|
|||
{
|
||||
"kind": "OBJECT",
|
||||
"name": "VulnerabilitiesCountByDayAndSeverity",
|
||||
"description": "Represents the number of vulnerabilities for a particular severity on a particular day",
|
||||
"description": "Represents the number of vulnerabilities for a particular severity on a particular day. This data is retained for 365 days",
|
||||
"fields": [
|
||||
{
|
||||
"name": "count",
|
||||
|
|
|
|||
|
|
@ -2948,7 +2948,7 @@ Autogenerated return type of UpdateSnippet.
|
|||
|
||||
### VulnerabilitiesCountByDay
|
||||
|
||||
Represents the count of vulnerabilities by severity on a particular day.
|
||||
Represents the count of vulnerabilities by severity on a particular day. This data is retained for 365 days.
|
||||
|
||||
| Field | Type | Description |
|
||||
| ----- | ---- | ----------- |
|
||||
|
|
@ -2963,7 +2963,7 @@ Represents the count of vulnerabilities by severity on a particular day.
|
|||
|
||||
### VulnerabilitiesCountByDayAndSeverity
|
||||
|
||||
Represents the number of vulnerabilities for a particular severity on a particular day.
|
||||
Represents the number of vulnerabilities for a particular severity on a particular day. This data is retained for 365 days.
|
||||
|
||||
| Field | Type | Description |
|
||||
| ----- | ---- | ----------- |
|
||||
|
|
|
|||
|
|
@ -467,6 +467,33 @@ that works for this problem. Follow these steps to use the tool in Auto DevOps:
|
|||
|
||||
1. Continue the deployments as usual.
|
||||
|
||||
### Error: error initializing: Looks like "https://kubernetes-charts.storage.googleapis.com" is not a valid chart repository or cannot be reached
|
||||
|
||||
As [announced in the official CNCF blogpost](https://www.cncf.io/blog/2020/10/07/important-reminder-for-all-helm-users-stable-incubator-repos-are-deprecated-and-all-images-are-changing-location/),
|
||||
the stable Helm chart repository will be deprecated and removed on November 13th, 2020.
|
||||
You may encounter this error after that date.
|
||||
|
||||
Some GitLab features had dependencies on the stable chart. To mitigate the impact, we changed them
|
||||
to use new official repositories or the [Helm Stable Archive repository maintained by GitLab](https://gitlab.com/gitlab-org/cluster-integration/helm-stable-archive).
|
||||
Auto Deploy contains [an example fix](https://gitlab.com/gitlab-org/cluster-integration/auto-deploy-image/-/merge_requests/127).
|
||||
|
||||
In Auto Deploy, `v1.0.6+` of `auto-deploy-image` no longer adds the deprecated stable repository to
|
||||
the `helm` command. If you use a custom chart and it relies on the deprecated stable repository,
|
||||
specify an older `auto-deploy-image` like this example:
|
||||
|
||||
```yaml
|
||||
include:
|
||||
- template: Auto-DevOps.gitlab-ci.yml
|
||||
|
||||
.auto-deploy:
|
||||
image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v1.0.5"
|
||||
```
|
||||
|
||||
Keep in mind that this approach will eventually stop working when the stable repository is removed,
|
||||
so you must eventually fix your custom chart.
|
||||
|
||||
You can find more information in [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/263778).
|
||||
|
||||
## Development guides
|
||||
|
||||
[Development guide for Auto DevOps](../../development/auto_devops.md)
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ enabled in a group.
|
|||
There is a timeline chart that shows how many open
|
||||
vulnerabilities your projects had at various points in time. You can display the vulnerability
|
||||
trends over a 30, 60, or 90-day time frame (the default is 90 days). Hover over the chart to get
|
||||
more details about the open vulnerabilities at a specific time.
|
||||
more details about the open vulnerabilities at a specific time. Aggregated data beyond 90 days can be accessed by querying our [VulnerabilitiesCountByDay GraphQL API](../../../api/graphql/reference/index.md#vulnerabilitiescountbyday). This data is retained for 365 days.
|
||||
|
||||
Next to the timeline chart is a list of projects, grouped and sorted by the severity of the vulnerability found:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
.dast-auto-deploy:
|
||||
image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v1.0.5"
|
||||
image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v1.0.6"
|
||||
|
||||
dast_environment_deploy:
|
||||
extends: .dast-auto-deploy
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
.auto-deploy:
|
||||
image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v1.0.5"
|
||||
image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v1.0.6"
|
||||
dependencies: []
|
||||
|
||||
review:
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
RSpec.shared_context 'GroupProjectsFinder context' do
|
||||
let(:group) { create(:group) }
|
||||
let(:subgroup) { create(:group, parent: group) }
|
||||
let(:current_user) { create(:user) }
|
||||
let_it_be(:group) { create(:group) }
|
||||
let_it_be(:subgroup) { create(:group, parent: group) }
|
||||
let_it_be(:current_user) { create(:user) }
|
||||
let(:params) { {} }
|
||||
let(:options) { {} }
|
||||
|
||||
let(:finder) { described_class.new(group: group, current_user: current_user, params: params, options: options) }
|
||||
|
||||
let!(:public_project) { create(:project, :public, group: group, path: '1') }
|
||||
let!(:private_project) { create(:project, :private, group: group, path: '2') }
|
||||
let!(:shared_project_1) { create(:project, :public, path: '3') }
|
||||
let!(:shared_project_2) { create(:project, :private, path: '4') }
|
||||
let!(:shared_project_3) { create(:project, :internal, path: '5') }
|
||||
let!(:subgroup_project) { create(:project, :public, path: '6', group: subgroup) }
|
||||
let!(:subgroup_private_project) { create(:project, :private, path: '7', group: subgroup) }
|
||||
let_it_be(:public_project) { create(:project, :public, group: group, path: '1') }
|
||||
let_it_be(:private_project) { create(:project, :private, group: group, path: '2') }
|
||||
let_it_be(:shared_project_1) { create(:project, :public, path: '3') }
|
||||
let_it_be(:shared_project_2) { create(:project, :private, path: '4') }
|
||||
let_it_be(:shared_project_3) { create(:project, :internal, path: '5') }
|
||||
let_it_be(:subgroup_project) { create(:project, :public, path: '6', group: subgroup) }
|
||||
let_it_be(:subgroup_private_project) { create(:project, :private, path: '7', group: subgroup) }
|
||||
|
||||
before do
|
||||
shared_project_1.project_group_links.create!(group_access: Gitlab::Access::MAINTAINER, group: group)
|
||||
|
|
|
|||
Loading…
Reference in a new issue