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
4a1e8d60
Commit
4a1e8d60
authored
Mar 05, 2019
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Usage ping for projects enforcing code owner approval
parent
bfc67bd0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
1 deletion
+31
-1
ee/app/models/ee/project.rb
ee/app/models/ee/project.rb
+2
-0
ee/lib/ee/gitlab/usage_data.rb
ee/lib/ee/gitlab/usage_data.rb
+2
-1
ee/spec/factories/projects.rb
ee/spec/factories/projects.rb
+4
-0
ee/spec/lib/gitlab/usage_data_spec.rb
ee/spec/lib/gitlab/usage_data_spec.rb
+12
-0
ee/spec/models/project_spec.rb
ee/spec/models/project_spec.rb
+11
-0
No files found.
ee/app/models/ee/project.rb
View file @
4a1e8d60
...
...
@@ -92,6 +92,8 @@ module EE
scope
:verification_failed_repos
,
->
{
joins
(
:repository_state
).
merge
(
ProjectRepositoryState
.
verification_failed_repos
)
}
scope
:verification_failed_wikis
,
->
{
joins
(
:repository_state
).
merge
(
ProjectRepositoryState
.
verification_failed_wikis
)
}
scope
:for_plan_name
,
->
(
name
)
{
joins
(
namespace: :plan
).
where
(
plans:
{
name:
name
})
}
scope
:requiring_code_owner_approval
,
->
{
where
(
merge_requests_require_code_owner_approval:
true
)
}
delegate
:shared_runners_minutes
,
:shared_runners_seconds
,
:shared_runners_seconds_last_reset
,
to: :statistics
,
allow_nil:
true
...
...
ee/lib/ee/gitlab/usage_data.rb
View file @
4a1e8d60
...
...
@@ -117,7 +117,8 @@ module EE
projects_mirrored_with_pipelines_enabled:
projects_mirrored_with_pipelines_enabled
,
projects_with_prometheus_alerts:
count
(
PrometheusAlert
.
distinct_projects
),
projects_with_packages:
count
(
::
Packages
::
Package
.
select
(
'distinct project_id'
)),
projects_with_tracing_enabled:
count
(
ProjectTracingSetting
)
projects_with_tracing_enabled:
count
(
ProjectTracingSetting
),
projects_enforcing_code_owner_approval:
count
(
::
Project
.
without_deleted
.
non_archived
.
requiring_code_owner_approval
)
}).
merge
(
service_desk_counts
).
merge
(
security_products_usage
)
# MySql does not support recursive queries so we can't retrieve epics relationship depth
...
...
ee/spec/factories/projects.rb
View file @
4a1e8d60
...
...
@@ -55,5 +55,9 @@ FactoryBot.modify do
trait
:random_last_repository_updated_at
do
last_repository_updated_at
{
rand
(
1
.
year
).
seconds
.
ago
}
end
trait
:requiring_code_owner_approval
do
merge_requests_require_code_owner_approval
true
end
end
end
ee/spec/lib/gitlab/usage_data_spec.rb
View file @
4a1e8d60
...
...
@@ -192,4 +192,16 @@ describe Gitlab::UsageData do
end
end
end
describe
'code owner approval required'
do
before
do
create
(
:project
,
:archived
,
:requiring_code_owner_approval
)
create
(
:project
,
:requiring_code_owner_approval
,
pending_delete:
true
)
create
(
:project
,
:requiring_code_owner_approval
)
end
it
'counts the projects actively requiring code owner approval'
do
expect
(
described_class
.
system_usage_data
[
:counts
][
:projects_enforcing_code_owner_approval
]).
to
eq
(
1
)
end
end
end
ee/spec/models/project_spec.rb
View file @
4a1e8d60
...
...
@@ -32,6 +32,17 @@ describe Project do
it
{
is_expected
.
to
have_many
(
:package_files
).
class_name
(
'Packages::PackageFile'
)
}
end
context
'scopes'
do
describe
'.requiring_code_owner_approval'
do
it
'only includes the right projects'
do
create
(
:project
)
expected_project
=
create
(
:project
,
merge_requests_require_code_owner_approval:
true
)
expect
(
described_class
.
requiring_code_owner_approval
).
to
contain_exactly
(
expected_project
)
end
end
end
describe
'validations'
do
let
(
:project
)
{
build
(
:project
)
}
...
...
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