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
a10317f0
Commit
a10317f0
authored
Apr 28, 2020
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove FF merge_trains_api
This commit removes the FF
parent
d58353db
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
13 deletions
+0
-13
ee/lib/api/merge_trains.rb
ee/lib/api/merge_trains.rb
+0
-1
ee/spec/requests/api/merge_trains_spec.rb
ee/spec/requests/api/merge_trains_spec.rb
+0
-12
No files found.
ee/lib/api/merge_trains.rb
View file @
a10317f0
...
...
@@ -5,7 +5,6 @@ module API
include
PaginationParams
before
do
service_unavailable!
unless
Feature
.
enabled?
(
:merge_trains_api
,
user_project
,
default_enabled:
true
)
authorize_read_merge_trains!
end
...
...
ee/spec/requests/api/merge_trains_spec.rb
View file @
a10317f0
...
...
@@ -84,18 +84,6 @@ describe API::MergeTrains do
expect
(
response
).
to
have_gitlab_http_status
(
:forbidden
)
end
end
context
'when feature flag is disabled'
do
before
do
stub_feature_flags
(
merge_trains_api:
false
)
end
it
'forbids the request'
do
subject
expect
(
response
).
to
have_gitlab_http_status
(
:service_unavailable
)
end
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