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
bb8e9026
Commit
bb8e9026
authored
Aug 19, 2020
by
Alex Buijs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add smtp_server to usage ping data
Send the value of the smtp_server along with usage ping
parent
b8910e6e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
0 deletions
+10
-0
changelogs/unreleased/238111-count-of-the-number-of-self-hosted-smtp-configurations-by-package.yml
...-number-of-self-hosted-smtp-configurations-by-package.yml
+5
-0
lib/gitlab/usage_data.rb
lib/gitlab/usage_data.rb
+3
-0
rubocop/rubocop-usage-data.yml
rubocop/rubocop-usage-data.yml
+1
-0
spec/lib/gitlab/usage_data_spec.rb
spec/lib/gitlab/usage_data_spec.rb
+1
-0
No files found.
changelogs/unreleased/238111-count-of-the-number-of-self-hosted-smtp-configurations-by-package.yml
0 → 100644
View file @
bb8e9026
---
title
:
Add smtp_server to usage ping data
merge_request
:
39844
author
:
type
:
changed
lib/gitlab/usage_data.rb
View file @
bb8e9026
...
...
@@ -269,6 +269,9 @@ module Gitlab
database:
{
adapter:
alt_usage_data
{
Gitlab
::
Database
.
adapter_name
},
version:
alt_usage_data
{
Gitlab
::
Database
.
version
}
},
mail:
{
smtp_server:
alt_usage_data
{
ActionMailer
::
Base
.
smtp_settings
[
:address
]
}
}
}
end
...
...
rubocop/rubocop-usage-data.yml
View file @
bb8e9026
...
...
@@ -4,6 +4,7 @@ UsageData/LargeTable:
-
'
lib/gitlab/usage_data.rb'
-
'
ee/lib/ee/gitlab/usage_data.rb'
NonRelatedClasses
:
-
:ActionMailer::Base
-
:Date
-
:Feature
-
:Gitlab
...
...
spec/lib/gitlab/usage_data_spec.rb
View file @
bb8e9026
...
...
@@ -673,6 +673,7 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
expect
(
subject
[
:git
][
:version
]).
to
eq
(
Gitlab
::
Git
.
version
)
expect
(
subject
[
:database
][
:adapter
]).
to
eq
(
Gitlab
::
Database
.
adapter_name
)
expect
(
subject
[
:database
][
:version
]).
to
eq
(
Gitlab
::
Database
.
version
)
expect
(
subject
[
:mail
][
:smtp_server
]).
to
eq
(
ActionMailer
::
Base
.
smtp_settings
[
:address
])
expect
(
subject
[
:gitaly
][
:version
]).
to
be_present
expect
(
subject
[
:gitaly
][
:servers
]).
to
be
>=
1
expect
(
subject
[
:gitaly
][
:clusters
]).
to
be
>=
0
...
...
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