diff options
| -rw-r--r-- | GITLAB_PAGES_VERSION | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/behaviors/shortcuts/shortcuts.js | 7 | ||||
| -rw-r--r-- | doc/development/merge_request_performance_guidelines.md | 8 | ||||
| -rw-r--r-- | doc/subscriptions/gitlab_com/index.md | 9 | ||||
| -rw-r--r-- | doc/user/usage_quotas.md | 2 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 1 |
6 files changed, 19 insertions, 10 deletions
diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION index ba0a719118c..5a5c7211dc6 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -1.51.0 +1.50.0 diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js index ac2a4184176..acb2355852d 100644 --- a/app/assets/javascripts/behaviors/shortcuts/shortcuts.js +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js @@ -173,7 +173,12 @@ export default class Shortcuts { e.preventDefault(); const canaryCookieName = 'gitlab_canary'; const currentValue = parseBoolean(Cookies.get(canaryCookieName)); - Cookies.set(canaryCookieName, (!currentValue).toString(), { expires: 365, path: '/' }); + Cookies.set(canaryCookieName, (!currentValue).toString(), { + expires: 365, + path: '/', + // next.gitlab.com uses a leading period. See https://gitlab.com/gitlab-org/gitlab/-/issues/350186 + domain: `.${window.location.hostname}`, + }); refreshCurrentPage(); } diff --git a/doc/development/merge_request_performance_guidelines.md b/doc/development/merge_request_performance_guidelines.md index 106db862122..c8e99e8547f 100644 --- a/doc/development/merge_request_performance_guidelines.md +++ b/doc/development/merge_request_performance_guidelines.md @@ -255,15 +255,15 @@ It re-instantiates project object for each build, instead of using the same in-m In this particular case the workaround is fairly easy: ```ruby +ActiveRecord::Associations::Preloader.new.preload(pipeline, [builds: :project]) + pipeline.builds.each do |build| - build.project = pipeline.project build.to_json(only: [:name], include: [project: { only: [:name]}]) end ``` -We can assign `pipeline.project` to each `build.project`, since we know it should point to the same project. -This allows us that each build point to the same in-memory project, -avoiding the cached SQL query and re-instantiation of the project object for each build. +`ActiveRecord::Associations::Preloader` uses the same in-memory object for the same project. +This avoids the cached SQL query and also avoids re-instantiation of the project object for each build. ## Executing Queries in Loops diff --git a/doc/subscriptions/gitlab_com/index.md b/doc/subscriptions/gitlab_com/index.md index ef1193c716f..b278e1c5e71 100644 --- a/doc/subscriptions/gitlab_com/index.md +++ b/doc/subscriptions/gitlab_com/index.md @@ -292,17 +292,20 @@ for more information. You can [purchase additional minutes](../../ci/pipelines/cicd_minutes.md#purchase-additional-cicd-minutes) for your personal or group namespace. -## Storage subscription +## Add-on subscription for additional Storage and Transfer + +NOTE: +Free namespaces are subject to a 5GB storage and 10GB transfer [soft limit](https://about.gitlab.com/pricing). Once all storage is available to view in the usage quota workflow, GitLab will automatically enforce the namespace storage limit and the project limit will be removed. This change will be announced separately. The storage and transfer add-on can be purchased to increase the limits. Projects have a free storage quota of 10 GB. To exceed this quota you must first [purchase one or -more storage subscription units](#purchase-more-storage). Each unit provides 10 GB of additional +more storage subscription units](#purchase-more-storage-and-transfer). Each unit provides 10 GB of additional storage per namespace. A storage subscription is renewed annually. For more details, see [Usage Quotas](../../user/usage_quotas.md). When the amount of purchased storage reaches zero, all projects over the free storage quota are locked. Projects can only be unlocked by purchasing more storage subscription units. -### Purchase more storage +### Purchase more storage and transfer You can purchase storage for your personal or group namespace. diff --git a/doc/user/usage_quotas.md b/doc/user/usage_quotas.md index 16b6424b232..75d10084328 100644 --- a/doc/user/usage_quotas.md +++ b/doc/user/usage_quotas.md @@ -49,7 +49,7 @@ The following storage usage statistics are available to an owner: Excess storage usage is the amount that a project's repository exceeds the free storage quota. If no purchased storage is available the project is locked. You cannot push changes to a locked project. -To unlock a project you must [purchase more storage](../subscriptions/gitlab_com/index.md#purchase-more-storage) +To unlock a project you must [purchase more storage](../subscriptions/gitlab_com/index.md#purchase-more-storage-and-transfer) for the namespace. When the purchase is completed, locked projects are automatically unlocked. The amount of purchased storage available must always be greater than zero. diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index fddcc1492a8..8020ffee36f 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -178,6 +178,7 @@ include: - template: Jobs/Helm-2to3.gitlab-ci.yml # https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/Jobs/Helm-2to3.gitlab-ci.yml - template: Security/DAST.gitlab-ci.yml # https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml - template: Security/Container-Scanning.gitlab-ci.yml # https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml + - template: Security/Cluster-Image-Scanning.gitlab-ci.yml # https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Security/Cluster-Image-Scanning.gitlab-ci.yml - template: Security/Dependency-Scanning.gitlab-ci.yml # https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml - template: Security/License-Scanning.gitlab-ci.yml # https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/Security/License-Scanning.gitlab-ci.yml - template: Security/SAST.gitlab-ci.yml # https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml |