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
679658da
Commit
679658da
authored
May 11, 2021
by
Dan Jensen
Committed by
Alper Akgun
May 11, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mark group-level MR Analytics metrics as removed
parent
34099496
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
73 deletions
+13
-73
config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
..._28d/20210216175004_g_analytics_merge_request_monthly.yml
+1
-1
config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
...s/counts_all/20210216174902_g_analytics_merge_request.yml
+3
-2
doc/development/usage_ping/dictionary.md
doc/development/usage_ping/dictionary.md
+3
-3
ee/app/controllers/groups/analytics/merge_request_analytics_controller.rb
...rs/groups/analytics/merge_request_analytics_controller.rb
+0
-20
ee/changelogs/unreleased/321785-deprecate-group-level-merge-request-analytics-metrics.yml
...deprecate-group-level-merge-request-analytics-metrics.yml
+5
-0
ee/config/metrics/counts_7d/20210216175002_g_analytics_merge_request_weekly.yml
...ts_7d/20210216175002_g_analytics_merge_request_weekly.yml
+1
-1
ee/spec/controllers/groups/analytics/merge_request_analytics_controller_spec.rb
...oups/analytics/merge_request_analytics_controller_spec.rb
+0
-46
No files found.
config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
View file @
679658da
...
...
@@ -6,7 +6,7 @@ product_stage: manage
product_group
:
group::optimize
product_category
:
value_type
:
number
status
:
data_available
status
:
removed
time_frame
:
28d
data_source
:
redis_hll
distribution
:
...
...
config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
View file @
679658da
...
...
@@ -6,8 +6,9 @@ product_stage: manage
product_group
:
group::optimize
product_category
:
value_type
:
number
status
:
data_available
time_frame
:
all
status
:
removed
time_frame
:
7d
data_source
:
redis_hll
data_source
:
distribution
:
-
ce
...
...
doc/development/usage_ping/dictionary.md
View file @
679658da
...
...
@@ -112,7 +112,7 @@ Unique visitors to /groups/:group/-/analytics/merge_request_analytics
Group:
`group::optimize`
Status:
`
data_available
`
Status:
`
removed
`
Tiers:
`free`
...
...
@@ -7396,7 +7396,7 @@ Missing description
Group:
`group::optimize`
Status:
`
data_available
`
Status:
`
removed
`
Tiers:
`free`
...
...
@@ -7408,7 +7408,7 @@ Missing description
Group:
`group::optimize`
Status:
`
data_available
`
Status:
`
removed
`
Tiers:
...
...
ee/app/controllers/groups/analytics/merge_request_analytics_controller.rb
deleted
100644 → 0
View file @
34099496
# frozen_string_literal: true
class
Groups::Analytics::MergeRequestAnalyticsController
<
Groups
::
Analytics
::
ApplicationController
include
Analytics
::
UniqueVisitsHelper
layout
'group'
before_action
:load_group
before_action
->
{
check_feature_availability!
(
:group_merge_request_analytics
)
}
before_action
->
{
authorize_view_by_action!
(
:read_group_merge_request_analytics
)
}
track_unique_visits
:show
,
target_id:
'g_analytics_merge_request'
def
show
end
end
ee/changelogs/unreleased/321785-deprecate-group-level-merge-request-analytics-metrics.yml
0 → 100644
View file @
679658da
---
title
:
Mark 3 group-level Merge Request Analytics metrics as removed
merge_request
:
60175
author
:
type
:
deprecated
ee/config/metrics/counts_7d/20210216175002_g_analytics_merge_request_weekly.yml
View file @
679658da
...
...
@@ -6,7 +6,7 @@ product_stage: manage
product_group
:
group::optimize
product_category
:
value_type
:
number
status
:
data_available
status
:
removed
time_frame
:
7d
data_source
:
redis_hll
distribution
:
...
...
ee/spec/controllers/groups/analytics/merge_request_analytics_controller_spec.rb
deleted
100644 → 0
View file @
34099496
# frozen_string_literal: true
require
'spec_helper'
RSpec
.
describe
Groups
::
Analytics
::
MergeRequestAnalyticsController
do
let_it_be
(
:current_user
)
{
create
(
:user
)
}
let_it_be
(
:group
)
{
create
:group
}
let_it_be
(
:feature_name
)
{
:group_merge_request_analytics
}
before
do
sign_in
(
current_user
)
stub_licensed_features
(
feature_name
=>
true
)
end
describe
'GET #show'
do
subject
{
get
:show
,
params:
{
group_id:
group
}
}
before
do
group
.
add_maintainer
(
current_user
)
end
it
{
is_expected
.
to
be_successful
}
it_behaves_like
'tracking unique visits'
,
:show
do
let
(
:request_params
)
{
{
group_id:
group
}
}
let
(
:target_id
)
{
'g_analytics_merge_request'
}
end
context
'when license is missing'
do
before
do
stub_licensed_features
(
feature_name
=>
false
)
end
it
{
is_expected
.
to
have_gitlab_http_status
(
:forbidden
)
}
end
context
'when the user has no access to the group'
do
before
do
current_user
.
group_members
.
delete_all
end
it
{
is_expected
.
to
have_gitlab_http_status
(
:forbidden
)
}
end
end
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