Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
4a21cb1a
Commit
4a21cb1a
authored
Aug 03, 2021
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab master
parents
34fade4e
64daeedc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
7 deletions
+3
-7
app/models/project.rb
app/models/project.rb
+0
-1
doc/administration/audit_events.md
doc/administration/audit_events.md
+0
-3
qa/qa/specs/features/ee/browser_ui/fulfillment/purchase/free_trial_spec.rb
...res/ee/browser_ui/fulfillment/purchase/free_trial_spec.rb
+1
-1
scripts/review_apps/base-config.yaml
scripts/review_apps/base-config.yaml
+2
-2
No files found.
app/models/project.rb
View file @
4a21cb1a
...
...
@@ -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
))
}
...
...
doc/administration/audit_events.md
View file @
4a21cb1a
...
...
@@ -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.
...
...
qa/qa/specs/features/ee/browser_ui/fulfillment/purchase/free_trial_spec.rb
View file @
4a21cb1a
...
...
@@ -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
...
...
scripts/review_apps/base-config.yaml
View file @
4a21cb1a
...
...
@@ -67,10 +67,10 @@ gitlab:
resources
:
requests
:
cpu
:
300m
memory
:
800
M
memory
:
1927
M
limits
:
cpu
:
450m
memory
:
2
00
0M
memory
:
2
89
0M
webservice
:
resources
:
requests
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment