diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-06-11 07:25:01 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-06-11 07:25:01 +0000 |
| commit | 641d332351907b77b53b0cb23ff51ccea2489824 (patch) | |
| tree | e53598605beef0ece77fbb4403324ad336d24ac5 /lib | |
| parent | c9216d630554132a8403cf251d122f93e44f2772 (diff) | |
| parent | df650eaae5f94357f155c9b35c51a6b8c98fb6d7 (diff) | |
| download | gitlab-ce-641d332351907b77b53b0cb23ff51ccea2489824.tar.gz | |
Merge branch 'sh-fix-utf-8-encoding-resolve-conflicts' into 'master'
Fix UTF-8 conversion issues when resolving conflicts
Closes #63062
See merge request gitlab-org/gitlab-ce!29453
Diffstat (limited to 'lib')
| -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 |