Fix can not automerge if description is too long
This commit is contained in:
parent
4ba5acd238
commit
a3d8be09c6
|
@ -11,6 +11,7 @@ v 6.9.0
|
||||||
- Improve issue and merge request mobile UI (Drew Blessing)
|
- Improve issue and merge request mobile UI (Drew Blessing)
|
||||||
- Document how to convert a backup to PostgreSQL
|
- Document how to convert a backup to PostgreSQL
|
||||||
- Fix locale bug in backup manager
|
- Fix locale bug in backup manager
|
||||||
|
- Fix can not automerge when MR description is too long
|
||||||
- Fix wiki backup skip bug
|
- Fix wiki backup skip bug
|
||||||
|
|
||||||
v 6.8.0
|
v 6.8.0
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
- if @show_merge_controls
|
- if @show_merge_controls
|
||||||
.automerge_widget.can_be_merged.hide
|
.automerge_widget.can_be_merged.hide
|
||||||
.clearfix
|
.clearfix
|
||||||
= form_for [:automerge, @project, @merge_request], remote: true, method: :get do |f|
|
= form_for [:automerge, @project, @merge_request], remote: true, method: :post do |f|
|
||||||
%h4
|
%h4
|
||||||
You can accept this request automatically.
|
You can accept this request automatically.
|
||||||
%div
|
%div
|
||||||
|
|
|
@ -273,7 +273,7 @@ Gitlab::Application.routes.draw do
|
||||||
resources :merge_requests, constraints: {id: /\d+/}, except: [:destroy] do
|
resources :merge_requests, constraints: {id: /\d+/}, except: [:destroy] do
|
||||||
member do
|
member do
|
||||||
get :diffs
|
get :diffs
|
||||||
get :automerge
|
post :automerge
|
||||||
get :automerge_check
|
get :automerge_check
|
||||||
get :ci_status
|
get :ci_status
|
||||||
end
|
end
|
||||||
|
|
|
@ -213,7 +213,7 @@ describe Projects::RefsController, "routing" do
|
||||||
end
|
end
|
||||||
|
|
||||||
# diffs_project_merge_request GET /:project_id/merge_requests/:id/diffs(.:format) projects/merge_requests#diffs
|
# diffs_project_merge_request GET /:project_id/merge_requests/:id/diffs(.:format) projects/merge_requests#diffs
|
||||||
# automerge_project_merge_request GET /:project_id/merge_requests/:id/automerge(.:format) projects/merge_requests#automerge
|
# automerge_project_merge_request POST /:project_id/merge_requests/:id/automerge(.:format) projects/merge_requests#automerge
|
||||||
# automerge_check_project_merge_request GET /:project_id/merge_requests/:id/automerge_check(.:format) projects/merge_requests#automerge_check
|
# automerge_check_project_merge_request GET /:project_id/merge_requests/:id/automerge_check(.:format) projects/merge_requests#automerge_check
|
||||||
# branch_from_project_merge_requests GET /:project_id/merge_requests/branch_from(.:format) projects/merge_requests#branch_from
|
# branch_from_project_merge_requests GET /:project_id/merge_requests/branch_from(.:format) projects/merge_requests#branch_from
|
||||||
# branch_to_project_merge_requests GET /:project_id/merge_requests/branch_to(.:format) projects/merge_requests#branch_to
|
# branch_to_project_merge_requests GET /:project_id/merge_requests/branch_to(.:format) projects/merge_requests#branch_to
|
||||||
|
@ -230,7 +230,10 @@ describe Projects::MergeRequestsController, "routing" do
|
||||||
end
|
end
|
||||||
|
|
||||||
it "to #automerge" do
|
it "to #automerge" do
|
||||||
get("/gitlab/gitlabhq/merge_requests/1/automerge").should route_to('projects/merge_requests#automerge', project_id: 'gitlab/gitlabhq', id: '1')
|
post('/gitlab/gitlabhq/merge_requests/1/automerge').should route_to(
|
||||||
|
'projects/merge_requests#automerge',
|
||||||
|
project_id: 'gitlab/gitlabhq', id: '1'
|
||||||
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
it "to #automerge_check" do
|
it "to #automerge_check" do
|
||||||
|
|
Loading…
Reference in New Issue