"Modify commit message" on merge request does not work
Summary
Even if I modify the commit message and click the Merge button, the commit is made with the template commit message.
Steps to reproduce
- Create Merge Request
- Click "Modify commit message"
- Edit "Commit message" (e.g.
Merge Commit
) - Click "Merge" button
What is the current bug behavior?
The commit message for merge commit is:
Merge branch 'test' into 'master'
Test Merge Request
See merge request !1 (closed)
What is the expected correct behavior?
The commit message for merge commit is:
Merge Commit
Relevant logs and/or screenshots
I tried the docker image gitlab/gitlab-ce:10.8.1-ce.0
.
gitlab | ==> /var/log/gitlab/gitlab-workhorse/current <==
gitlab | 2018-05-29_02:28:29.80038 localhost:9701 @ - - [2018/05/29:02:28:29 +0000] "POST /root/test/merge_requests/1/merge HTTP/1.1" 200 20 "http://localhost:9701/root/test/merge_requests/1" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.1 Safari/605.1.15" 0.148
gitlab | 2018-05-29_02:28:30.01110 localhost:9701 @ - - [2018/05/29:02:28:30 +0000] "GET /root/test/merge_requests/1.json?serializer=basic HTTP/1.1" 200 481 "http://localhost:9701/root/test/merge_requests/1" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.1 Safari/605.1.15" 0.203
gitlab |
gitlab | ==> /var/log/gitlab/sidekiq/current <==
gitlab | 2018-05-29_02:28:29.78274 2018-05-29T02:28:29.782Z 982 TID-osf027kek MergeWorker JID-11259f876b3b5c8526f7d6d9 INFO: start
gitlab |
gitlab | ==> /var/log/gitlab/nginx/gitlab_access.log <==
gitlab | 172.24.0.1 - - [29/May/2018:02:28:29 +0000] "POST /root/test/merge_requests/1/merge HTTP/1.1" 200 20 "http://localhost:9701/root/test/merge_requests/1" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.1 Safari/605.1.15"
gitlab | 172.24.0.1 - - [29/May/2018:02:28:30 +0000] "GET /root/test/merge_requests/1.json?serializer=basic HTTP/1.1" 200 481 "http://localhost:9701/root/test/merge_requests/1" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.1 Safari/605.1.15"
gitlab |
gitlab | ==> /var/log/gitlab/gitlab-rails/production_json.log <==
gitlab | {"method":"POST","path":"/root/test/merge_requests/1/merge","format":"json","controller":"Projects::MergeRequestsController","action":"merge","status":200,"duration":114.03,"view":0.49,"db":63.97,"time":"2018-05-29T02:28:29.683Z","params":[{"key":"sha","value":"d1030796e904bf2887574f7d8df876be817dc7c2"},{"key":"commit_message","value":"Merge Commit"},{"key":"merge_when_pipeline_succeeds","value":false},{"key":"should_remove_source_branch","value":false},{"key":"namespace_id","value":"root"},{"key":"project_id","value":"test"},{"key":"id","value":"1"},{"key":"merge_request","value":{"merge_when_pipeline_succeeds":false}}],"remote_ip":"172.24.0.1","user_id":1,"username":"root"}
gitlab | {"method":"GET","path":"/root/test/merge_requests/1.json","format":"json","controller":"Projects::MergeRequestsController","action":"show","status":200,"duration":150.92,"view":0.97,"db":69.35,"time":"2018-05-29T02:28:29.857Z","params":[{"key":"serializer","value":"basic"},{"key":"namespace_id","value":"root"},{"key":"project_id","value":"test"},{"key":"id","value":"1"}],"remote_ip":"172.24.0.1","user_id":1,"username":"root","gitaly_calls":1}
gitlab |
gitlab | ==> /var/log/gitlab/gitlab-rails/production.log <==
gitlab | Started POST "/root/test/merge_requests/1/merge" for 172.24.0.1 at 2018-05-29 02:28:29 +0000
gitlab | Processing by Projects::MergeRequestsController#merge as JSON
gitlab | Parameters: {"sha"=>"d1030796e904bf2887574f7d8df876be817dc7c2", "commit_message"=>"Merge Commit", "merge_when_pipeline_succeeds"=>false, "should_remove_source_branch"=>false, "namespace_id"=>"root", "project_id"=>"test", "id"=>"1", "merge_request"=>{"merge_when_pipeline_succeeds"=>false}}
gitlab | Completed 200 OK in 112ms (Views: 0.5ms | ActiveRecord: 64.0ms)
gitlab | Started GET "/root/test/merge_requests/1.json?serializer=basic" for 172.24.0.1 at 2018-05-29 02:28:29 +0000
gitlab | Processing by Projects::MergeRequestsController#show as JSON
gitlab | Parameters: {"serializer"=>"basic", "namespace_id"=>"root", "project_id"=>"test", "id"=>"1"}
gitlab | root/test!1 - Git merge started on JID 11259f876b3b5c8526f7d6d9
gitlab | Completed 200 OK in 148ms (Views: 1.0ms | ActiveRecord: 69.4ms)
gitlab | Started POST "/api/v4/internal/allowed" for 127.0.0.1 at 2018-05-29 02:28:30 +0000
gitlab |
gitlab | ==> /var/log/gitlab/gitaly/current <==
gitlab | 2018-05-29_02:28:30.26199 time="2018-05-29T02:28:30Z" level=info msg="finished unary call" grpc.code=OK grpc.meta.call_site=repository_cleanup grpc.meta.client_name=gitlab-web grpc.method=RepositoryExists grpc.request.glRepository=project-2 grpc.request.repoPath=root/test.git grpc.request.repoStorage=default grpc.request.topLevelGroup=root grpc.service=gitaly.RepositoryService grpc.time_ms=5 peer.address=@ span.kind=server system=grpc
gitlab | 2018-05-29_02:28:30.28704 time="2018-05-29T02:28:30Z" level=info msg="finished unary call" grpc.code=OK grpc.meta.call_site=repository_cleanup grpc.meta.client_name=gitlab-web grpc.method=Cleanup grpc.request.glRepository=project-2 grpc.request.repoPath=root/test.git grpc.request.repoStorage=default grpc.request.topLevelGroup=root grpc.service=gitaly.RepositoryService grpc.time_ms=22 peer.address=@ span.kind=server system=grpc
gitlab | 2018-05-29_02:28:30.93212 time="2018-05-29T02:28:30Z" level=info msg="finished unary call" grpc.code=OK grpc.meta.call_site=ref_exists grpc.meta.client_name=gitlab-sidekiq grpc.method=RefExists grpc.request.glRepository=project-2 grpc.request.repoPath=root/test.git grpc.request.repoStorage=default grpc.request.topLevelGroup=root grpc.service=gitaly.RefService grpc.time_ms=25 peer.address=@ span.kind=server system=grpc
gitlab | 2018-05-29_02:28:31.09265 time="2018-05-29T02:28:31Z" level=info msg="finished unary call" grpc.code=OK grpc.meta.call_site=ref_exists grpc.meta.client_name=gitlab-sidekiq grpc.method=RefExists grpc.request.glRepository=project-2 grpc.request.repoPath=root/test.git grpc.request.repoStorage=default grpc.request.topLevelGroup=root grpc.service=gitaly.RefService grpc.time_ms=35 peer.address=@ span.kind=server system=grpc
gitlab |
gitlab | ==> /var/log/gitlab/sidekiq/current <==
gitlab | 2018-05-29_02:28:30.76094 2018-05-29T02:28:30.760Z 982 TID-osf027l0s PostReceive JID-50e817c6f46e97c4f56c8a3a INFO: start
gitlab | 2018-05-29_02:28:30.87263 2018-05-29T02:28:30.872Z 982 TID-osf027jdc ProcessCommitWorker JID-9be949e2ebf8f327d8ff9a88 INFO: start
gitlab | 2018-05-29_02:28:30.88069 2018-05-29T02:28:30.880Z 982 TID-osf027j78 UpdateMergeRequestsWorker JID-7ad5acfe589b88f9374e8f15 INFO: start
gitlab | 2018-05-29_02:28:31.07581 2018-05-29T02:28:31.075Z 982 TID-osf027j78 UpdateMergeRequestsWorker JID-7ad5acfe589b88f9374e8f15 INFO: done: 0.195 sec
gitlab | 2018-05-29_02:28:31.16628 2018-05-29T02:28:31.166Z 982 TID-osf027jl4 SystemHookPushWorker JID-191ac104f1c427f593e08b7a INFO: start
gitlab | 2018-05-29_02:28:31.18221 2018-05-29T02:28:31.181Z 982 TID-osf027jl4 SystemHookPushWorker JID-191ac104f1c427f593e08b7a INFO: done: 0.015 sec
gitlab | 2018-05-29_02:28:31.19686 2018-05-29T02:28:31.196Z 982 TID-osf027kls ProjectCacheWorker JID-e1537fc60d66341b02632f03 INFO: start
gitlab | 2018-05-29_02:28:31.23910 2018-05-29T02:28:31.238Z 982 TID-osf027l0s PostReceive JID-50e817c6f46e97c4f56c8a3a INFO: done: 0.479 sec
gitlab |
gitlab | ==> /var/log/gitlab/gitlab-shell/gitlab-shell.log <==
gitlab | time="2018-05-29T02:28:30+00:00" level=info msg="finished HTTP request" duration=0.2852212 method=POST pid=14163 url="http://127.0.0.1:8080/api/v4/internal/allowed"
gitlab | time="2018-05-29T02:28:30+00:00" level=info msg="finished HTTP request" duration=0.0085069 method=POST pid=14163 url="http://127.0.0.1:8080/api/v4/internal/pre_receive"
gitlab | time="2018-05-29T02:28:30+00:00" level=info msg="finished HTTP request" duration=0.0422141 method=POST pid=14180 url="http://127.0.0.1:8080/api/v4/internal/post_receive"
gitlab |
gitlab | ==> /var/log/gitlab/gitlab-rails/production.log <==
gitlab | Started POST "/api/v4/internal/pre_receive" for 127.0.0.1 at 2018-05-29 02:28:30 +0000
gitlab | Started POST "/api/v4/internal/post_receive" for 127.0.0.1 at 2018-05-29 02:28:30 +0000
gitlab | root/test!1 - Git merge finished on JID 11259f876b3b5c8526f7d6d9 commit 8901d8f65907840a9011581ae66d86a0df1aa1df
gitlab | root/test!1 - Post merge started on JID 11259f876b3b5c8526f7d6d9 with state locked
gitlab |
gitlab | ==> /var/log/gitlab/gitlab-rails/api_json.log <==
gitlab | {"time":"2018-05-29T02:28:30.481Z","severity":"INFO","duration":275.0,"db":53.02,"view":221.98,"status":200,"method":"POST","path":"/api/v4/internal/allowed","params":{"action":"git-receive-pack","changes":"21a0d039228996fd4f7cd58dee9ac41eb39a028c 8901d8f65907840a9011581ae66d86a0df1aa1df refs/heads/master\n","gl_repository":"project-2","project":"/var/opt/gitlab/git-data/repositories/root/test.git","protocol":"web","env":"{\"GIT_ALTERNATE_OBJECT_DIRECTORIES\":[],\"GIT_ALTERNATE_OBJECT_DIRECTORIES_RELATIVE\":[],\"GIT_OBJECT_DIRECTORY\":null,\"GIT_OBJECT_DIRECTORY_RELATIVE\":null}","user_id":"1","secret_token":"[FILTERED]"},"host":"127.0.0.1","ip":"127.0.0.1","ua":"Ruby"}
gitlab | {"time":"2018-05-29T02:28:30.504Z","severity":"INFO","duration":1.25,"db":0.0,"view":1.25,"status":200,"method":"POST","path":"/api/v4/internal/pre_receive","params":{"gl_repository":"project-2","secret_token":"[FILTERED]"},"host":"127.0.0.1","ip":"127.0.0.1","ua":"Ruby"}
gitlab | {"time":"2018-05-29T02:28:30.793Z","severity":"INFO","duration":34.98,"db":23.51,"view":11.469999999999995,"status":200,"method":"POST","path":"/api/v4/internal/post_receive","params":{"gl_repository":"project-2","identifier":"user-1","changes":"21a0d039228996fd4f7cd58dee9ac41eb39a028c 8901d8f65907840a9011581ae66d86a0df1aa1df refs/heads/master\n","secret_token":"[FILTERED]"},"host":"127.0.0.1","ip":"127.0.0.1","ua":"Ruby"}
gitlab |
gitlab | ==> /var/log/gitlab/gitlab-workhorse/current <==
gitlab | 2018-05-29_02:28:31.65397 localhost:9701 @ - - [2018/05/29:02:28:31 +0000] "GET /help HTTP/1.1" 200 38197 "" "curl/7.59.0" 0.118
gitlab | 2018-05-29_02:28:32.26267 localhost:9701 @ - - [2018/05/29:02:28:32 +0000] "GET /root/test/merge_requests/1.json?serializer=basic HTTP/1.1" 200 481 "http://localhost:9701/root/test/merge_requests/1" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.1 Safari/605.1.15" 0.242
gitlab |
gitlab | ==> /var/log/gitlab/sidekiq/current <==
gitlab | 2018-05-29_02:28:31.33932 2018-05-29T02:28:31.339Z 982 TID-osf027kls ProjectCacheWorker JID-e1537fc60d66341b02632f03 INFO: done: 0.142 sec
gitlab | 2018-05-29_02:28:31.43025 2018-05-29T02:28:31.430Z 982 TID-osf027jdc ProcessCommitWorker JID-9be949e2ebf8f327d8ff9a88 INFO: done: 0.558 sec
gitlab | 2018-05-29_02:28:31.54185 2018-05-29T02:28:31.541Z 982 TID-osf027kek MergeWorker JID-11259f876b3b5c8526f7d6d9 INFO: done: 1.759 sec
gitlab |
gitlab | ==> /var/log/gitlab/nginx/gitlab_access.log <==
gitlab | 127.0.0.1 - - [29/May/2018:02:28:31 +0000] "GET /help HTTP/1.1" 200 38249 "" "curl/7.59.0"
gitlab | 172.24.0.1 - - [29/May/2018:02:28:32 +0000] "GET /root/test/merge_requests/1.json?serializer=basic HTTP/1.1" 200 481 "http://localhost:9701/root/test/merge_requests/1" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.1 Safari/605.1.15"
gitlab |
gitlab | ==> /var/log/gitlab/gitlab-rails/production_json.log <==
gitlab | {"method":"GET","path":"/help","format":"*/*","controller":"HelpController","action":"index","status":200,"duration":103.32,"view":97.42,"db":0.0,"time":"2018-05-29T02:28:31.548Z","params":[],"remote_ip":"127.0.0.1","user_id":null,"username":null}
gitlab | {"method":"GET","path":"/root/test/merge_requests/1.json","format":"json","controller":"Projects::MergeRequestsController","action":"show","status":200,"duration":189.69,"view":0.53,"db":68.8,"time":"2018-05-29T02:28:32.071Z","params":[{"key":"serializer","value":"basic"},{"key":"namespace_id","value":"root"},{"key":"project_id","value":"test"},{"key":"id","value":"1"}],"remote_ip":"172.24.0.1","user_id":1,"username":"root","gitaly_calls":2}
gitlab |
gitlab | ==> /var/log/gitlab/gitlab-rails/production.log <==
gitlab | root/test!1 - Post merge finished on JID 11259f876b3b5c8526f7d6d9 with state merged
gitlab | root/test!1 - Merge process finished on JID with state merged
gitlab | Started GET "/help" for 127.0.0.1 at 2018-05-29 02:28:31 +0000
gitlab | Processing by HelpController#index as */*
gitlab | Completed 200 OK in 102ms (Views: 97.4ms | ActiveRecord: 0.0ms)
gitlab | Started GET "/root/test/merge_requests/1.json?serializer=basic" for 172.24.0.1 at 2018-05-29 02:28:32 +0000
gitlab | Processing by Projects::MergeRequestsController#show as JSON
gitlab | Parameters: {"serializer"=>"basic", "namespace_id"=>"root", "project_id"=>"test", "id"=>"1"}
gitlab | Completed 200 OK in 166ms (Views: 0.5ms | ActiveRecord: 68.8ms)
gitlab | Started GET "/root/test/merge_requests/1.json?serializer=widget" for 172.24.0.1 at 2018-05-29 02:28:32 +0000
gitlab | Started GET "/root/test/merge_requests/1/commit_change_content" for 172.24.0.1 at 2018-05-29 02:28:32 +0000
gitlab | Processing by Projects::MergeRequestsController#show as JSON
gitlab | Parameters: {"serializer"=>"widget", "namespace_id"=>"root", "project_id"=>"test", "id"=>"1"}
gitlab | Processing by Projects::MergeRequestsController#commit_change_content as JSON
gitlab | Parameters: {"namespace_id"=>"root", "project_id"=>"test", "id"=>"1"}
gitlab |
gitlab | ==> /var/log/gitlab/gitlab-workhorse/current <==
gitlab | 2018-05-29_02:28:32.60209 localhost:9701 @ - - [2018/05/29:02:28:32 +0000] "GET /root/test/merge_requests/1/commit_change_content HTTP/1.1" 200 5444 "http://localhost:9701/root/test/merge_requests/1" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.1 Safari/605.1.15" 0.330
gitlab | 2018-05-29_02:28:32.69021 localhost:9701 @ - - [2018/05/29:02:28:32 +0000] "GET /root/test/merge_requests/1.json?serializer=widget HTTP/1.1" 200 4151 "http://localhost:9701/root/test/merge_requests/1" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.1 Safari/605.1.15" 0.418
gitlab |
gitlab | ==> /var/log/gitlab/nginx/gitlab_access.log <==
gitlab | 172.24.0.1 - - [29/May/2018:02:28:32 +0000] "GET /root/test/merge_requests/1/commit_change_content HTTP/1.1" 200 1369 "http://localhost:9701/root/test/merge_requests/1" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.1 Safari/605.1.15"
gitlab | 172.24.0.1 - - [29/May/2018:02:28:32 +0000] "GET /root/test/merge_requests/1.json?serializer=widget HTTP/1.1" 200 1394 "http://localhost:9701/root/test/merge_requests/1" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.1 Safari/605.1.15"
gitlab |
gitlab | ==> /var/log/gitlab/gitlab-rails/production_json.log <==
gitlab | {"method":"GET","path":"/root/test/merge_requests/1/commit_change_content","format":"json","controller":"Projects::MergeRequestsController","action":"commit_change_content","status":200,"duration":277.27,"view":163.14,"db":90.43,"time":"2018-05-29T02:28:32.322Z","params":[{"key":"namespace_id","value":"root"},{"key":"project_id","value":"test"},{"key":"id","value":"1"}],"remote_ip":"172.24.0.1","user_id":1,"username":"root","gitaly_calls":2}
gitlab | {"method":"GET","path":"/root/test/merge_requests/1.json","format":"json","controller":"Projects::MergeRequestsController","action":"show","status":200,"duration":365.9,"view":1.21,"db":130.53,"time":"2018-05-29T02:28:32.321Z","params":[{"key":"serializer","value":"widget"},{"key":"namespace_id","value":"root"},{"key":"project_id","value":"test"},{"key":"id","value":"1"}],"remote_ip":"172.24.0.1","user_id":1,"username":"root","gitaly_calls":4}
gitlab | {"method":"GET","path":"/-/metrics","format":"html","controller":"MetricsController","action":"index","status":200,"duration":2.66,"view":0.39,"db":0.0,"time":"2018-05-29T02:28:32.840Z","params":[],"remote_ip":null,"user_id":null,"username":null}
gitlab |
gitlab | ==> /var/log/gitlab/gitlab-rails/production.log <==
gitlab | Completed 200 OK in 275ms (Views: 163.1ms | ActiveRecord: 90.4ms)
gitlab | Completed 200 OK in 364ms (Views: 1.2ms | ActiveRecord: 130.5ms)
gitlab | Started GET "/-/metrics" for 127.0.0.1 at 2018-05-29 02:28:32 +0000
gitlab | Processing by MetricsController#index as HTML
gitlab | Completed 200 OK in 1ms (Views: 0.4ms | ActiveRecord: 0.0ms)