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
0e7ea3cd
Commit
0e7ea3cd
authored
Jan 14, 2021
by
Tristan Read
Committed by
David O'Regan
Jan 14, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove the `incident_metric_upload_ui` feature flag
parent
326e793d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
20 deletions
+7
-20
ee/app/models/issuable_metric_image.rb
ee/app/models/issuable_metric_image.rb
+1
-1
ee/changelogs/unreleased/tr-metric-image-feature-flag-removal.yml
...elogs/unreleased/tr-metric-image-feature-flag-removal.yml
+5
-0
ee/config/feature_flags/development/incident_metric_upload_ui.yml
...g/feature_flags/development/incident_metric_upload_ui.yml
+0
-8
ee/spec/helpers/ee/issuables_helper_spec.rb
ee/spec/helpers/ee/issuables_helper_spec.rb
+0
-1
ee/spec/models/issuable_metric_image_spec.rb
ee/spec/models/issuable_metric_image_spec.rb
+1
-10
No files found.
ee/app/models/issuable_metric_image.rb
View file @
0e7ea3cd
...
...
@@ -21,7 +21,7 @@ class IssuableMetricImage < ApplicationRecord
MAX_FILE_SIZE
=
1
.
megabyte
.
freeze
def
self
.
available_for?
(
project
)
Feature
.
enabled?
(
:incident_metric_upload_ui
,
project
)
&&
project
&
.
feature_available?
(
:incident_metric_upload
)
project
&
.
feature_available?
(
:incident_metric_upload
)
end
def
filename
...
...
ee/changelogs/unreleased/tr-metric-image-feature-flag-removal.yml
0 → 100644
View file @
0e7ea3cd
---
title
:
Add metric image feature for Incidents
merge_request
:
51552
author
:
type
:
added
ee/config/feature_flags/development/incident_metric_upload_ui.yml
deleted
100644 → 0
View file @
326e793d
---
name
:
incident_metric_upload_ui
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46731
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/293934
milestone
:
'
13.8'
type
:
development
group
:
group::monitor
default_enabled
:
false
ee/spec/helpers/ee/issuables_helper_spec.rb
View file @
0e7ea3cd
...
...
@@ -84,7 +84,6 @@ RSpec.describe IssuablesHelper do
context
'when incident metric upload is available'
do
before
do
stub_licensed_features
(
incident_metric_upload:
true
)
stub_feature_flags
(
incident_metric_upload_ui:
issue
.
project
)
end
let_it_be
(
:issue
)
{
create
(
:issue
,
author:
user
,
description:
'issue text'
,
issue_type: :incident
)
}
...
...
ee/spec/models/issuable_metric_image_spec.rb
View file @
0e7ea3cd
...
...
@@ -44,23 +44,14 @@ RSpec.describe IssuableMetricImage do
before
do
stub_licensed_features
(
incident_metric_upload:
true
)
stub_feature_flags
(
incident_metric_upload_ui:
true
)
end
let_it_be_with_refind
(
:issue
)
{
create
(
:issue
)
}
context
'license
and feature flag
enabled'
do
context
'license enabled'
do
it
{
is_expected
.
to
eq
(
true
)
}
end
context
'feature flag disabled'
do
before
do
stub_feature_flags
(
incident_metric_upload_ui:
false
)
end
it
{
is_expected
.
to
eq
(
false
)
}
end
context
'license disabled'
do
before
do
stub_licensed_features
(
incident_metric_upload:
false
)
...
...
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