Commit 1afb6eac authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch 'remove-ff-merge_trains_api' into 'master'

Remove FF merge_trains_api

See merge request gitlab-org/gitlab!30600
parents 2e098f90 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
......
......@@ -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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment