diff options
Diffstat (limited to 'app/services/git')
| -rw-r--r-- | app/services/git/base_hooks_service.rb | 2 | ||||
| -rw-r--r-- | app/services/git/wiki_push_service/change.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/services/git/base_hooks_service.rb b/app/services/git/base_hooks_service.rb index 1ca1bfa0c05..1eb54e13522 100644 --- a/app/services/git/base_hooks_service.rb +++ b/app/services/git/base_hooks_service.rb @@ -69,7 +69,7 @@ module Git # Creating push_data invokes one CommitDelta RPC per commit. Only # build this data if we actually need it. project.execute_hooks(push_data, hook_name) if project.has_active_hooks?(hook_name) - project.execute_services(push_data, hook_name) if project.has_active_services?(hook_name) + project.execute_integrations(push_data, hook_name) if project.has_active_integrations?(hook_name) end def enqueue_invalidate_cache 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 |