diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-30 15:08:27 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-30 15:08:27 +0000 |
| commit | 9376fdc13edb5fb822431df943fa088b6a273316 (patch) | |
| tree | f12ac6debd2c3efc59f1629062628f40996e752f /app/services/git/wiki_push_service/change.rb | |
| parent | 7c28a677895df5195ed6342921934734646c90c9 (diff) | |
| download | gitlab-ce-9376fdc13edb5fb822431df943fa088b6a273316.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/git/wiki_push_service/change.rb')
| -rw-r--r-- | app/services/git/wiki_push_service/change.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/git/wiki_push_service/change.rb b/app/services/git/wiki_push_service/change.rb index 9109a7f9d58..8fc821b59fc 100644 --- a/app/services/git/wiki_push_service/change.rb +++ b/app/services/git/wiki_push_service/change.rb @@ -66,7 +66,8 @@ module Git def strip_extension(filename) return unless filename - File.basename(filename, File.extname(filename)) + encoded_filename = Gitlab::EncodingHelper.encode_utf8(filename.dup) + File.basename(encoded_filename, File.extname(encoded_filename)) end end end |