Download as
Browse Code »

Commit 0fd12a786af3d3fdc672b82ca76b7e0512efad7d

Authored by Dmitriy Zaporozhets
2 parents e0fdb426 a3d8be09
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge pull request #6825 from sue445/feature/post_automerge 

Fix can not automerge when description is too long
Showing 4 changed files with 8 additions and 4 deletions   Show diff stats
CHANGELOG
  Diff comments   View file @0fd12a7
... ... @@ -11,6 +11,7 @@ v 6.9.0
11 11 - Improve issue and merge request mobile UI (Drew Blessing)
12 12 - Document how to convert a backup to PostgreSQL
13 13 - Fix locale bug in backup manager
  14 + - Fix can not automerge when MR description is too long
14 15 - Fix wiki backup skip bug
15 16 - Two Step MR creation process
16 17 - Remove unwanted files from satellite working directory with git clean -fdx
... ...
app/views/projects/merge_requests/show/_mr_accept.html.haml
  Diff comments   View file @0fd12a7
... ... @@ -12,7 +12,7 @@
12 12 - if @show_merge_controls
13 13 .automerge_widget.can_be_merged.hide
14 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 16 %h4
17 17 You can accept this request automatically.
18 18 %div
... ...
config/routes.rb
  Diff comments   View file @0fd12a7
... ... @@ -273,7 +273,7 @@ Gitlab::Application.routes.draw do
273 273 resources :merge_requests, constraints: {id: /\d+/}, except: [:destroy] do
274 274 member do
275 275 get :diffs
276   - get :automerge
  276 + post :automerge
277 277 get :automerge_check
278 278 get :ci_status
279 279 end
... ...
spec/routing/project_routing_spec.rb
  Diff comments   View file @0fd12a7
... ... @@ -213,7 +213,7 @@ describe Projects::RefsController, "routing" do
213 213 end
214 214  
215 215 # diffs_project_merge_request GET /:project_id/merge_requests/:id/diffs(.:format) projects/merge_requests#diffs
216   -# automerge_project_merge_request GET /:project_id/merge_requests/:id/automerge(.:format) projects/merge_requests#automerge
  216 +# automerge_project_merge_request POST /:project_id/merge_requests/:id/automerge(.:format) projects/merge_requests#automerge
217 217 # automerge_check_project_merge_request GET /:project_id/merge_requests/:id/automerge_check(.:format) projects/merge_requests#automerge_check
218 218 # branch_from_project_merge_requests GET /:project_id/merge_requests/branch_from(.:format) projects/merge_requests#branch_from
219 219 # 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
230 230 end
231 231  
232 232 it "to #automerge" do
233   - get("/gitlab/gitlabhq/merge_requests/1/automerge").should route_to('projects/merge_requests#automerge', project_id: 'gitlab/gitlabhq', id: '1')
  233 + post('/gitlab/gitlabhq/merge_requests/1/automerge').should route_to(
  234 + 'projects/merge_requests#automerge',
  235 + project_id: 'gitlab/gitlabhq', id: '1'
  236 + )
234 237 end
235 238  
236 239 it "to #automerge_check" do
... ...