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
71f77182
Commit
71f77182
authored
Jan 29, 2021
by
Steve Abrams
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove deploy_tokens_api feature flag
Remove deploy_tokens_api feature flag which has been enabled since 12.9.
parent
7a503520
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
34 deletions
+0
-34
config/feature_flags/development/deploy_tokens_api.yml
config/feature_flags/development/deploy_tokens_api.yml
+0
-8
lib/api/deploy_tokens.rb
lib/api/deploy_tokens.rb
+0
-10
spec/requests/api/deploy_tokens_spec.rb
spec/requests/api/deploy_tokens_spec.rb
+0
-16
No files found.
config/feature_flags/development/deploy_tokens_api.yml
deleted
100644 → 0
View file @
7a503520
---
name
:
deploy_tokens_api
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/25219
rollout_issue_url
:
milestone
:
'
12.9'
type
:
development
group
:
group::package
default_enabled
:
true
lib/api/deploy_tokens.rb
View file @
71f77182
...
...
@@ -28,8 +28,6 @@ module API
use
:pagination
end
get
'deploy_tokens'
do
service_unavailable!
unless
Feature
.
enabled?
(
:deploy_tokens_api
,
default_enabled:
true
)
authenticated_as_admin!
present
paginate
(
DeployToken
.
all
),
with:
Entities
::
DeployToken
...
...
@@ -39,10 +37,6 @@ module API
requires
:id
,
type:
String
,
desc:
'The ID of a project'
end
resource
:projects
,
requirements:
API
::
NAMESPACE_OR_PROJECT_REQUIREMENTS
do
before
do
service_unavailable!
unless
Feature
.
enabled?
(
:deploy_tokens_api
,
user_project
,
default_enabled:
true
)
end
params
do
use
:pagination
end
...
...
@@ -102,10 +96,6 @@ module API
requires
:id
,
type:
String
,
desc:
'The ID of a group'
end
resource
:groups
,
requirements:
API
::
NAMESPACE_OR_PROJECT_REQUIREMENTS
do
before
do
service_unavailable!
unless
Feature
.
enabled?
(
:deploy_tokens_api
,
user_group
,
default_enabled:
true
)
end
params
do
use
:pagination
end
...
...
spec/requests/api/deploy_tokens_spec.rb
View file @
71f77182
...
...
@@ -10,24 +10,12 @@ RSpec.describe API::DeployTokens do
let!
(
:deploy_token
)
{
create
(
:deploy_token
,
projects:
[
project
])
}
let!
(
:group_deploy_token
)
{
create
(
:deploy_token
,
:group
,
groups:
[
group
])
}
shared_examples
'with feature flag disabled'
do
context
'disabled feature flag'
do
before
do
stub_feature_flags
(
deploy_tokens_api:
false
)
end
it
{
is_expected
.
to
have_gitlab_http_status
(
:service_unavailable
)
}
end
end
describe
'GET /deploy_tokens'
do
subject
do
get
api
(
'/deploy_tokens'
,
user
)
response
end
it_behaves_like
'with feature flag disabled'
context
'when unauthenticated'
do
let
(
:user
)
{
nil
}
...
...
@@ -81,8 +69,6 @@ RSpec.describe API::DeployTokens do
project
.
add_maintainer
(
user
)
end
it_behaves_like
'with feature flag disabled'
it
{
is_expected
.
to
have_gitlab_http_status
(
:ok
)
}
it
'returns all deploy tokens for the project'
do
...
...
@@ -128,8 +114,6 @@ RSpec.describe API::DeployTokens do
group
.
add_maintainer
(
user
)
end
it_behaves_like
'with feature flag disabled'
it
{
is_expected
.
to
have_gitlab_http_status
(
:ok
)
}
it
'returns all deploy tokens for the group'
do
...
...
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