Backport bugfix to 5.3.x and release in 9.4.x?
Zendesk: https://gitlab.zendesk.com/agent/tickets/80801
There is a bug in 5.3.1 which was fixed in f5591f68. The bug was at f5591f68 where the 5th arg nil
was missing. This caused the following error for a customer on rebase:
July 31, 2017 20:35 -> ERROR -> MergeRequests::RebaseService error (test/test!24): Failed to push rebased branch with `/opt/gitlab/embedded/bin/git push -f origin gitlab_ci_migration`:
July 31, 2017 20:35 -> ERROR -> MergeRequests::RebaseService error (test/!24): remote: /opt/gitlab/embedded/service/gitlab-shell/lib/gitlab_access_status.rb:6:in `initialize': wrong number of arguments (given 4, expected 5) (ArgumentError)
remote: from /opt/gitlab/embedded/service/gitlab-shell/lib/gitlab_net.rb:42:in `new'
remote: from /opt/gitlab/embedded/service/gitlab-shell/lib/gitlab_net.rb:42:in `check_access'
remote: from /opt/gitlab/embedded/service/gitlab-shell/lib/gitlab_access.rb:31:in `block in exec'
remote: from /opt/gitlab/embedded/service/gitlab-shell/lib/gitlab_metrics.rb:47:in `measure'
remote: from /opt/gitlab/embedded/service/gitlab-shell/lib/gitlab_access.rb:25:in `exec'
remote: from hooks/pre-receive:24:in `<main>'
To /var/opt/gitlab/git-data/repositories/212568159/system_test.git
! [remote rejected] gitlab_ci_migration -> gitlab_ci_migration (pre-receive hook declined)
error: failed to push some refs to '/var/opt/gitlab/git-data/repositories/212568159/system_test.git'
July 31, 2017 20:39 -> ERROR -> MergeRequests::RebaseService error (test/test!24): Failed to push rebased branch with `/opt/gitlab/embedded/bin/git push -f origin gitlab_ci_migration`:
July 31, 2017 20:39 -> ERROR -> MergeRequests::RebaseService error (test/test!24): remote: /opt/gitlab/embedded/service/gitlab-shell/lib/gitlab_access_status.rb:6:in `initialize': wrong number of arguments (given 4, expected 5) (ArgumentError)
remote: from /opt/gitlab/embedded/service/gitlab-shell/lib/gitlab_net.rb:42:in `new'
remote: from /opt/gitlab/embedded/service/gitlab-shell/lib/gitlab_net.rb:42:in `check_access'
remote: from /opt/gitlab/embedded/service/gitlab-shell/lib/gitlab_access.rb:31:in `block in exec'
remote: from /opt/gitlab/embedded/service/gitlab-shell/lib/gitlab_metrics.rb:47:in `measure'
remote: from /opt/gitlab/embedded/service/gitlab-shell/lib/gitlab_access.rb:25:in `exec'
remote: from hooks/pre-receive:24:in `<main>'
To /var/opt/gitlab/git-data/repositories/212568159/test.git
! [remote rejected] gitlab_ci_migration -> gitlab_ci_migration (pre-receive hook declined)
error: failed to push some refs to '/var/opt/gitlab/git-data/repositories/212568159/test.git'
Currently, the fix is in shell 5.6.0+ which isn't released in any GitLab version yet. I presume then that it would only drop in 9.5.0 which is a ways away yet and the customer may not be able to upgrade right away. Does it make sense to backport this and release shell 5.3.2 and then GitLab 9.4.4? cc/ @stanhu since you fixed the bug.