Merge pull request #6825 from sue445/feature/post_automerge

Fix can not automerge when description is too long

Merge pull request #6825 from sue445/feature/post_automerge
Fix can not automerge when description is too long
Dmitriy Zaporozhets
2 parents e0fdb426 a3d8be09
Showing 4 changed files with 8 additions and 4 deletions Show diff stats
CHANGELOG
app/views/projects/merge_requests/show/_mr_accept.html.haml
config/routes.rb
spec/routing/project_routing_spec.rb
@@ -11,6 +11,7 @@ v 6.9.0
   - Improve issue and merge request mobile UI (Drew Blessing)
   - Document how to convert a backup to PostgreSQL
   - Fix locale bug in backup manager
+  - Fix can not automerge when MR description is too long
   - Fix wiki backup skip bug
   - Two Step MR creation process
   - Remove unwanted files from satellite working directory with git clean -fdx
@@ -12,7 +12,7 @@
 - if @show_merge_controls
   .automerge_widget.can_be_merged.hide
     .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
           You can accept this request automatically.
         %div
@@ -273,7 +273,7 @@ Gitlab::Application.routes.draw do
       resources :merge_requests, constraints: {id: /\d+/}, except: [:destroy] do
         member do
           get :diffs
-          get :automerge
+          post :automerge
           get :automerge_check
           get :ci_status
         end
@@ -213,7 +213,7 @@ describe Projects::RefsController, &quot;routing&quot; do
 end
 #           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
 #    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
@@ -230,7 +230,10 @@ describe Projects::MergeRequestsController, &quot;routing&quot; do
   end
   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
   it "to #automerge_check" do
	@@ -12,7 +12,7 @@		@@ -12,7 +12,7 @@
12	- if @show_merge_controls	12	- if @show_merge_controls
13	.automerge_widget.can_be_merged.hide	13	.automerge_widget.can_be_merged.hide
14	.clearfix	14	.clearfix
15	- = form_for [:automerge, @project, @merge_request], remote: true, method: :get do \|f\|	15	+ = form_for [:automerge, @project, @merge_request], remote: true, method: :post do \|f\|
16	%h4	16	%h4
17	You can accept this request automatically.	17	You can accept this request automatically.
18	%div	18	%div
	@@ -273,7 +273,7 @@ Gitlab::Application.routes.draw do		@@ -273,7 +273,7 @@ Gitlab::Application.routes.draw do
273	resources :merge_requests, constraints: {id: /\d+/}, except: [:destroy] do	273	resources :merge_requests, constraints: {id: /\d+/}, except: [:destroy] do
274	member do	274	member do
275	get :diffs	275	get :diffs
276	- get :automerge	276	+ post :automerge
277	get :automerge_check	277	get :automerge_check
278	get :ci_status	278	get :ci_status
279	end	279	end