diff options
Diffstat (limited to 'lib/gitlab/gitaly_client/conflicts_service.rb')
| -rw-r--r-- | lib/gitlab/gitaly_client/conflicts_service.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/gitaly_client/conflicts_service.rb b/lib/gitlab/gitaly_client/conflicts_service.rb index 077b63205a8..d16e45c964d 100644 --- a/lib/gitlab/gitaly_client/conflicts_service.rb +++ b/lib/gitlab/gitaly_client/conflicts_service.rb @@ -65,9 +65,9 @@ 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, - commit_message: resolution.commit_message, + 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 ) end |