diff options
author | Stan Hu <stanhu@gmail.com> | 2019-06-11 06:50:00 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-06-11 06:50:00 +0300 |
commit | df650eaae5f94357f155c9b35c51a6b8c98fb6d7 (patch) | |
tree | cd36f7c33d3e4ceaa156c59bb6fda46e4dab3900 /lib/gitlab/gitaly_client | |
parent | 1edf1807c570d74ee0039f5f58ef607ee797187a (diff) |
Force source and target branch to binary mode
Diffstat (limited to 'lib/gitlab/gitaly_client')
-rw-r--r-- | lib/gitlab/gitaly_client/conflicts_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/gitaly_client/conflicts_service.rb b/lib/gitlab/gitaly_client/conflicts_service.rb index 3ab4ef4adfb..d16e45c964d 100644 --- a/lib/gitlab/gitaly_client/conflicts_service.rb +++ b/lib/gitlab/gitaly_client/conflicts_service.rb @@ -65,8 +65,8 @@ module Gitlab our_commit_oid: @our_commit_oid, target_repository: target_repository.gitaly_repository, their_commit_oid: @their_commit_oid, - source_branch: source_branch, - target_branch: target_branch, + source_branch: encode_binary(source_branch), + target_branch: encode_binary(target_branch), commit_message: encode_binary(resolution.commit_message), user: Gitlab::Git::User.from_gitlab(resolution.user).to_gitaly ) |