kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

Browse source
This commit is contained in:
GitLab Bot 2022-03-28 03:09:02 +00:00
parent ad4fc5ec9b
commit e566469060
12 changed files with 43 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/stylesheets/framework/header.scss
View file

@ -1,5 +1,3 @@
$top-nav-hover-bg: var(--indigo-900-alpha-008, $indigo-900-alpha-008) !important;
.navbar-gitlab {
padding: 0 16px;
z-index: $header-zindex;
@ -574,7 +572,7 @@ $top-nav-hover-bg: var(--indigo-900-alpha-008, $indigo-900-alpha-008) !important
}
.frequent-items-list-item-container > a:hover {
background-color: $top-nav-hover-bg;
background-color: $nav-active-bg;
}
}
@ -589,11 +587,9 @@ $top-nav-hover-bg: var(--indigo-900-alpha-008, $indigo-900-alpha-008) !important
}
.top-nav-menu-item {
color: var(--indigo-900, $theme-indigo-900) !important;
&.active,
&:hover {
background-color: $top-nav-hover-bg;
background-color: $nav-active-bg;
}
.gl-icon {
@ -603,7 +599,6 @@ $top-nav-hover-bg: var(--indigo-900-alpha-008, $indigo-900-alpha-008) !important
.top-nav-responsive {
@include gl-display-none;
color: var(--indigo-900, $theme-indigo-900);
}
.top-nav-responsive-open {

1
app/assets/stylesheets/framework/variables.scss
View file

@ -363,6 +363,7 @@ $well-expand-item: #e8f2f7 !default;
$well-inner-border: #eef0f2 !default;
$well-light-border: #f1f1f1;
$well-light-text-color: #5b6169;
$nav-active-bg: var(--nav-active-bg, rgba($black, 0.08)) !important;
/*
* Text

5
app/assets/stylesheets/startup/startup-dark.scss
View file

@ -9,7 +9,6 @@ body.gl-dark {
--gray-900: #fafafa;
--green-100: #0d532a;
--green-700: #91d4a8;
--indigo-900-alpha-008: rgba(235, 235, 250, 0.08);
--gl-text-color: #fafafa;
--border-color: #4f4f4f;
--black: #fff;
@ -1739,7 +1738,6 @@ body.gl-dark {
--indigo-800: #d1d1f0;
--indigo-900: #ebebfa;
--indigo-950: #f7f7ff;
--indigo-900-alpha-008: rgba(235, 235, 250, 0.08);
--purple-50: #232150;
--purple-100: #2f2a6b;
--purple-200: #453894;
@ -1769,7 +1767,7 @@ body.gl-dark {
box-shadow: none;
}
.nav-sidebar li.active:not(.fly-out-top-item) > a:not(.has-sub-items) {
background-color: var(--indigo-900-alpha-008);
background-color: var(--nav-active-bg);
}
body.gl-dark {
--gl-theme-accent: #868686;
@ -1972,7 +1970,6 @@ body.gl-dark {
--indigo-800: #d1d1f0;
--indigo-900: #ebebfa;
--indigo-950: #f7f7ff;
--indigo-900-alpha-008: rgba(235, 235, 250, 0.08);
--purple-50: #232150;
--purple-100: #2f2a6b;
--purple-200: #453894;

2
app/assets/stylesheets/themes/_dark.scss
View file

@ -70,7 +70,6 @@ $indigo-700: #a6a6de;
$indigo-800: #d1d1f0;
$indigo-900: #ebebfa;
$indigo-950: #f7f7ff;
$indigo-900-alpha-008: rgba($indigo-900, 0.08);
$purple-50: #232150;
$purple-100: #2f2a6b;
@ -174,7 +173,6 @@ body.gl-dark {
--indigo-800: #{$indigo-800};
--indigo-900: #{$indigo-900};
--indigo-950: #{$indigo-950};
--indigo-900-alpha-008: #{$indigo-900-alpha-008};
--purple-50: #{$purple-50};
--purple-100: #{$purple-100};

4
app/assets/stylesheets/themes/dark_mode_overrides.scss
View file

@ -48,7 +48,7 @@
}
> a:hover {
background-color: var(--indigo-900-alpha-008);
background-color: var(--nav-active-bg);
}
&.active {
@ -56,7 +56,7 @@
&:not(.fly-out-top-item) {
> a:not(.has-sub-items) {
background-color: var(--indigo-900-alpha-008);
background-color: var(--nav-active-bg);
}
}
}

8
db/migrate/20220322205004_change_search_rate_limit_default_values.rb Normal file
View file

@ -0,0 +1,8 @@
# frozen_string_literal: true
class ChangeSearchRateLimitDefaultValues < Gitlab::Database::Migration[1.0]
def change
change_column_default :application_settings, :search_rate_limit, from: 30, to: 300
change_column_default :application_settings, :search_rate_limit_unauthenticated, from: 10, to: 100
end
end

18
db/post_migrate/20220322205008_change_search_rate_limit_values.rb Normal file
View file

@ -0,0 +1,18 @@
# frozen_string_literal: true
class ChangeSearchRateLimitValues < Gitlab::Database::Migration[1.0]
def up
# Change search_rate_limits to a more reasonable value
# as long as they are still using the default values.
#
# The reason why `search_rate_limit` could be either 30 or 60
# is because its value was ported over from the now deprecated
# `user_email_lookup_limit` which had a default value of 60.
execute("update application_settings set search_rate_limit=300 where search_rate_limit IN (30,60)")
execute("update application_settings set search_rate_limit_unauthenticated=100 where search_rate_limit_unauthenticated = 10")
end
def down
# noop. Because this migration is updating values, it is not reversible.
end
end

1
db/schema_migrations/20220322205004 Normal file
View file

@ -0,0 +1 @@
af69da66a3deb250494204fecf4bc91b4fd10f529ab766746ae98072f54bf245

1
db/schema_migrations/20220322205008 Normal file
View file

@ -0,0 +1 @@
465de916b1c951287a101da37156fb0f59a4bd1cb4ab7076dc48e07e326fa4e4

4
db/structure.sql
View file

@ -11251,8 +11251,8 @@ CREATE TABLE application_settings (
users_get_by_id_limit integer DEFAULT 300 NOT NULL,
users_get_by_id_limit_allowlist text[] DEFAULT '{}'::text[] NOT NULL,
container_registry_expiration_policies_caching boolean DEFAULT true NOT NULL,
search_rate_limit integer DEFAULT 30 NOT NULL,
search_rate_limit_unauthenticated integer DEFAULT 10 NOT NULL,
search_rate_limit integer DEFAULT 300 NOT NULL,
search_rate_limit_unauthenticated integer DEFAULT 100 NOT NULL,
encrypted_database_grafana_api_key bytea,
encrypted_database_grafana_api_key_iv bytea,
database_grafana_api_url text,

10
doc/administration/job_artifacts.md
View file

@ -307,19 +307,19 @@ To migrate back to local storage:
## Expiring artifacts
> [In GitLab 14.6](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76504), we improved the performance of removing expired artifacts, introduced [with a flag](feature_flags.md) named `ci_destroy_all_expired_service`. Disabled by default.
> - [In GitLab 14.6](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76504), we improved the performance of removing expired artifacts. However, due to a bug with potential data loss, we paused removal of expired artifacts. Removal of expired artifacts was put behind a [feature flag](feature_flags.md) named `ci_destroy_all_expired_service`. Disabled by default.
> - In GitLab 14.8 and later, the bug is fixed and we have resumed the removal of expired artifacts. We are preparing backports for GitLab 14.6 and 14.7.
FLAG:
On self-managed GitLab, by default this feature is not available. To make it available, ask an administrator to
On self-managed GitLab 14.6 and 14.7, this feature is not available. To make it available, ask an administrator to
[enable the feature flag](feature_flags.md) named `ci_destroy_all_expired_service`. The feature is not ready for
production use.
On GitLab.com, this feature is not available.
### Removing expired job artifacts on GitLab self-managed instances
### Removing expired job artifacts on GitLab 14.6 and 14.7 self-managed instances
In the process of migrating old artifacts for our SaaS customers, we are working to resolve any potential unrecoverable data loss for self-managed customers for artifacts that they may not want deleted yet. Before we can use the more performant way of cleaning up expired artifacts, we need to do some remediation to make sure customers don't lose their data, which is part of our effort in [the relevant epic](https://gitlab.com/groups/gitlab-org/-/epics/7097).
Two options are available:
Two options are available for GitLab 14.6 and GitLab 14.7 self-managed instances:
- If you don't need any artifacts created before 2020-06-23, an Administrator can enable the worker for removing expired CI/CD artifacts:

3
doc/api/project_access_tokens.md
View file

@ -82,7 +82,8 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/a
## Create a project access token
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55408) in GitLab 13.10.
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55408) in GitLab 13.10.
> - The `token` attribute was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55408) in GitLab 13.10.
Create a [project access token](../user/project/settings/project_access_tokens.md).