Skip to content

GitLab

Closed
Created by Administrator@rootOwner

Accept merge request won't auto merge with ver 5.2.0 6654db2c

Created by: sriharshav

Upgraded to 5.2.0 6654db2c

After clicking on accept merge request, page refreshes and again shows accept merge request. Changes are reflected in satellite repository, but they are not pushed to origin

Request gets 304 Not Modified as response.

      Request URL:http://gitlabserver/sec/proj1/merge_requests/813/automerge?                 utf8=%E2%9C%93&commit=Accept+Merge+Request
      Request Method:GET
      Status Code:304 Not Modified

server log shows 200 OK

Started GET "/sec/proj1/merge_requests/813/automerge?utf8=%E2%9C%93&commit=Accept+Merge+Request" for xx.xx.xx.xx at 2013-05-24 18:13:01 +0530
Processing by MergeRequestsController#automerge as JS
  Parameters: {"utf8"=>"â", "commit"=>"Accept Merge Request", "project_id"=>"sec/proj1", "id"=>"813"}
  Rendered merge_requests/automerge.js.haml (0.1ms)
Completed 200 OK in 885ms (Views: 1.0ms | ActiveRecord: 0.9ms)
Started GET "/sec/proj1/merge_requests/813" for 10.140.198.67 at 2013-05-24 18:13:01 +0530
Processing by MergeRequestsController#show as HTML
  Parameters: {"project_id"=>"sec/proj1", "id"=>"813"}
  Rendered votes/_votes_block.html.haml (1.1ms)
  Rendered merge_requests/show/_mr_title.html.haml (5.0ms)
  Rendered merge_requests/show/_how_to_merge.html.haml (0.5ms)
  Rendered merge_requests/show/_mr_box.html.haml (2.1ms)