Commit 4a21cb1a authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab master

parents 34fade4e 64daeedc
......@@ -537,7 +537,6 @@ class Project < ApplicationRecord
scope :visible_to_user_and_access_level, ->(user, access_level) { where(id: user.authorized_projects.where('project_authorizations.access_level >= ?', access_level).select(:id).reorder(nil)) }
scope :archived, -> { where(archived: true) }
scope :non_archived, -> { where(archived: false) }
scope :for_milestones, ->(ids) { joins(:milestones).where('milestones.id' => ids).distinct }
scope :with_push, -> { joins(:events).merge(Event.pushed_action) }
scope :with_project_feature, -> { joins('LEFT JOIN project_features ON projects.id = project_features.project_id') }
scope :with_jira_dvcs_cloud, -> { joins(:feature_usage).merge(ProjectFeatureUsage.with_jira_dvcs_integration_enabled(cloud: true)) }
......
......@@ -205,9 +205,6 @@ It may make the user interface for your project or audit events very busy, and t
`audit_events` PostgreSQL table may increase considerably. It's disabled by default
to prevent performance degradations on GitLab instances with very high Git write traffic.
In an upcoming release, Audit Events for Git push events are planned to be enabled
by default. Follow our [Partitioning strategy for Audit Events epic](https://gitlab.com/groups/gitlab-org/-/epics/3206) for updates.
If you still wish to enable **Repository push** events in your instance, follow
the steps below.
......
......@@ -42,7 +42,7 @@ module QA
Page::Trials::New.perform(&:visit)
end
it 'registers for a new trial' do
it 'registers for a new trial', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1851' do
Page::Trials::New.perform do |new|
# setter
new.company_name = company_name
......
......@@ -67,10 +67,10 @@ gitlab:
resources:
requests:
cpu: 300m
memory: 800M
memory: 1927M
limits:
cpu: 450m
memory: 2000M
memory: 2890M
webservice:
resources:
requests:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment