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
ea54253a
Commit
ea54253a
authored
Feb 22, 2021
by
Adam Hegyi
Committed by
Alex Kalderimis
Feb 23, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove clear_status_with_quick_options FF
This change removes the clear_status_with_quick_options.
parent
f962e3ad
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
24 deletions
+1
-24
config/feature_flags/development/clear_status_with_quick_options.yml
...ure_flags/development/clear_status_with_quick_options.yml
+0
-8
lib/api/users.rb
lib/api/users.rb
+1
-4
spec/requests/api/users_spec.rb
spec/requests/api/users_spec.rb
+0
-12
No files found.
config/feature_flags/development/clear_status_with_quick_options.yml
deleted
100644 → 0
View file @
f962e3ad
---
name
:
clear_status_with_quick_options
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53620
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/320777
milestone
:
'
13.9'
type
:
development
group
:
group::optimize
default_enabled
:
true
lib/api/users.rb
View file @
ea54253a
...
...
@@ -1071,10 +1071,7 @@ module API
put
"status"
,
feature_category: :users
do
forbidden!
unless
can?
(
current_user
,
:update_user_status
,
current_user
)
update_params
=
declared_params
update_params
.
delete
(
:clear_status_after
)
if
Feature
.
disabled?
(
:clear_status_with_quick_options
,
current_user
,
default_enabled: :yaml
)
if
::
Users
::
SetStatusService
.
new
(
current_user
,
update_params
).
execute
if
::
Users
::
SetStatusService
.
new
(
current_user
,
declared_params
).
execute
present
current_user
.
status
,
with:
Entities
::
UserStatus
else
render_validation_error!
(
current_user
.
status
)
...
...
spec/requests/api/users_spec.rb
View file @
ea54253a
...
...
@@ -3044,18 +3044,6 @@ RSpec.describe API::Users do
expect
(
response
).
to
have_gitlab_http_status
(
:bad_request
)
end
context
'when the clear_status_with_quick_options feature flag is disabled'
do
before
do
stub_feature_flags
(
clear_status_with_quick_options:
false
)
end
it
'does not persist clear_status_at'
do
put
api
(
'/user/status'
,
user
),
params:
{
emoji:
'smirk'
,
message:
'hello world'
,
clear_status_after:
'3_hours'
}
expect
(
user
.
status
.
reload
.
clear_status_at
).
to
be_nil
end
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