Remove route
This commit is contained in:
parent
92cdf78dcf
commit
3e08713c79
|
@ -153,12 +153,6 @@ class MergeRequestEntity < IssuableEntity
|
|||
format: :json)
|
||||
end
|
||||
|
||||
expose :merge_check_path do |merge_request|
|
||||
merge_check_namespace_project_merge_request_path(merge_request.project.namespace,
|
||||
merge_request.project,
|
||||
merge_request)
|
||||
end
|
||||
|
||||
expose :ci_environments_status_path do |merge_request|
|
||||
ci_environments_status_namespace_project_merge_request_path(merge_request.project.namespace,
|
||||
merge_request.project,
|
||||
|
|
|
@ -74,7 +74,6 @@ constraints(ProjectUrlConstrainer.new) do
|
|||
get :conflicts
|
||||
get :conflict_for_path
|
||||
get :pipelines
|
||||
get :merge_check
|
||||
get :commit_change_content
|
||||
post :merge
|
||||
post :cancel_merge_when_pipeline_succeeds
|
||||
|
|
|
@ -243,7 +243,6 @@ describe 'project routing' do
|
|||
# diffs_namespace_project_merge_request GET /:namespace_id/:project_id/merge_requests/:id/diffs(.:format) projects/merge_requests#diffs
|
||||
# commits_namespace_project_merge_request GET /:namespace_id/:project_id/merge_requests/:id/commits(.:format) projects/merge_requests#commits
|
||||
# merge_namespace_project_merge_request POST /:namespace_id/:project_id/merge_requests/:id/merge(.:format) projects/merge_requests#merge
|
||||
# merge_check_namespace_project_merge_request GET /:namespace_id/:project_id/merge_requests/:id/merge_check(.:format) projects/merge_requests#merge_check
|
||||
# ci_status_namespace_project_merge_request GET /:namespace_id/:project_id/merge_requests/:id/ci_status(.:format) projects/merge_requests#ci_status
|
||||
# toggle_subscription_namespace_project_merge_request POST /:namespace_id/:project_id/merge_requests/:id/toggle_subscription(.:format) projects/merge_requests#toggle_subscription
|
||||
# branch_from_namespace_project_merge_requests GET /:namespace_id/:project_id/merge_requests/branch_from(.:format) projects/merge_requests#branch_from
|
||||
|
@ -272,10 +271,6 @@ describe 'project routing' do
|
|||
)
|
||||
end
|
||||
|
||||
it 'to #merge_check' do
|
||||
expect(get('/gitlab/gitlabhq/merge_requests/1/merge_check')).to route_to('projects/merge_requests#merge_check', namespace_id: 'gitlab', project_id: 'gitlabhq', id: '1')
|
||||
end
|
||||
|
||||
it 'to #branch_from' do
|
||||
expect(get('/gitlab/gitlabhq/merge_requests/branch_from')).to route_to('projects/merge_requests#branch_from', namespace_id: 'gitlab', project_id: 'gitlabhq')
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue