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
5bc1c640
Commit
5bc1c640
authored
Jul 28, 2020
by
Arturo Herrero
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move Jira usage data methods together
parent
afdea89e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
+11
-11
lib/gitlab/usage_data.rb
lib/gitlab/usage_data.rb
+11
-11
No files found.
lib/gitlab/usage_data.rb
View file @
5bc1c640
...
...
@@ -353,9 +353,7 @@ module Gitlab
results
end
# rubocop: enable CodeReuse/ActiveRecord
# rubocop: disable CodeReuse/ActiveRecord
def
services_usage
# rubocop: disable UsageData/LargeTable:
Service
.
available_services_names
.
without
(
'jira'
).
each_with_object
({})
do
|
service_name
,
response
|
...
...
@@ -391,15 +389,6 @@ module Gitlab
rescue
ActiveRecord
::
StatementInvalid
{
projects_jira_server_active:
FALLBACK
,
projects_jira_cloud_active:
FALLBACK
,
projects_jira_active:
FALLBACK
}
end
# rubocop: disable UsageData/LargeTable
def
successful_deployments_with_cluster
(
scope
)
scope
.
joins
(
cluster: :deployments
)
.
merge
(
Clusters
::
Cluster
.
enabled
)
.
merge
(
Deployment
.
success
)
end
# rubocop: enable UsageData/LargeTable
# rubocop: enable CodeReuse/ActiveRecord
def
jira_import_usage
...
...
@@ -414,6 +403,17 @@ module Gitlab
# rubocop: enable UsageData/LargeTable
end
# rubocop: disable CodeReuse/ActiveRecord
# rubocop: disable UsageData/LargeTable
def
successful_deployments_with_cluster
(
scope
)
scope
.
joins
(
cluster: :deployments
)
.
merge
(
Clusters
::
Cluster
.
enabled
)
.
merge
(
Deployment
.
success
)
end
# rubocop: enable UsageData/LargeTable
# rubocop: enable CodeReuse/ActiveRecord
def
user_preferences_usage
{}
# augmented in EE
end
...
...
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